Skip to content

Fix ST2 Client for Windows Clients #6071

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arm4b merged 12 commits into from
Nov 28, 2023
Merged

Fix ST2 Client for Windows Clients #6071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
48264bd
add plattform check
Nov 25, 2023
4f620a5
Update base.py
Nov 25, 2023
335c85b
Update CHANGELOG.rst
Nov 25, 2023
c0fbd8a
Update base.py
Nov 25, 2023
5bfa5ef
Update base.py
Nov 26, 2023
dfcdf21
linting CHANGELOG.rst
Nov 26, 2023
dcbb600
Lint CHANGELOG.rst
Nov 26, 2023
0cd317f
retry linting
Nov 26, 2023
f6ea344
Change Bugfix
Nov 27, 2023
0e2ef9c
move comment some lines down
Nov 27, 2023
6d7bfed
Merge branch 'master' into master
arm4b Nov 28, 2023
62c0a88
Reformat with black
arm4b Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,16 @@ in development

Fixed
~~~~~
* Fix Snyk Security Finding Cross-site Scripting (XSS) in contrib/examples/sensors/echo_flask_app.py
Contributed by (@philipphomberger Schwarz IT KG)

* Additional fixes for st2 client auth when proxy auth mode enabled #6049
* Fix proxy auth mode in HA environments #5766 #6049
Contributed by @floatingstatic

* Fix issue with linux pack actions failed to run remotely due to incorrect python shebang. #5983 #6042
Contributed by Ronnie Hoffmann (@ZoeLeah Schwarz IT KG)

* Fix proxy auth mode in HA environments #5766
Contributed by @floatingstatic

* Fix CI usses #6015
Contributed by Amanda McGuinness (@amanda11 intive)

* Bumped `paramiko` to `2.10.5` to fix an issue with SSH Certs - https://github.com/paramiko/paramiko/issues/2017
* Bumped `paramiko` to `2.10.5` to fix an issue with SSH Certs - paramiko/paramiko#2017 (security)
Contributed by @jk464

* Avoid logging sensitive information in debug (fix #5977)
Expand All @@ -30,6 +24,12 @@ Fixed

* Fix #4676, edge case where --inherit-env is skipped if the action has no parameters

* Fix ST2 Client for Windows Clients. PWD is a Unix only Libary. #6071
Contributed by (@philipphomberger Schwarz IT KG)

* Fix Snyk Security Finding Cross-site Scripting (XSS) in contrib/examples/sensors/echo_flask_app.py #6070
Contributed by (@philipphomberger Schwarz IT KG)

* Update cryptography 3.4.7 -> 39.0.1, pyOpenSSL 21.0.0 -> 23.1.0, paramiko 2.10.5 -> 2.11.0 (security). #6055

* Bumped `eventlet` to `0.33.3` and `gunicorn` to `21.2.0` to fix `RecursionError` bug in setting `SSLContext` `minimum_version` property. (security) #6061
Expand Down Expand Up @@ -72,7 +72,6 @@ Added
Contributed by Amanda McGuinness (@amanda11 intive)

* Run the st2 self-check in Github Actions and support the environment variable `TESTS_TO_SKIP` to skip tests when running st2-self-check. #5609

Contributed by @winem

Changed
Expand Down
11 changes: 8 additions & 3 deletions st2client/st2client/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
from __future__ import absolute_import

import os
import pwd
import json
import logging
import time
import calendar
import traceback
import platform

import six
import requests
Expand All @@ -40,8 +40,13 @@

__all__ = ["BaseCLIApp"]

# Fix for "os.getlogin()) OSError: [Errno 2] No such file or directory"
os.getlogin = lambda: pwd.getpwuid(os.getuid())[0]
# Add Plattform Check to fix the Issue that PWD not exist on Windows and so the ST2 CLI not working.
# https://docs.python.org/3.8/library/pwd.html
if platform.system() != "Windows":
import pwd

# Fix for "os.getlogin()) OSError: [Errno 2] No such file or directory"
os.getlogin = lambda: pwd.getpwuid(os.getuid())[0]

# How many seconds before the token actual expiration date we should consider the token as
# expired. This is used to prevent the operation from failing durig the API request because the
Expand Down