ben.carrasco/prowler
1
0
Fork 0
mirror of https://github.com/prowler-cloud/prowler.git synced 2026-07-24 13:01:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: apply suggestions

Browse Source
This commit is contained in:
Daniel Barranquero
2025-10-09 14:18:08 +02:00
parent 1e813dbace
commit 9240a04aca
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
prowler/providers/github/github_provider.py
+5 -6
View File
@@ -162,12 +162,14 @@ class GithubProvider(Provider):
elif github_app_id and (
github_app_key or github_app_key_path or github_app_key_content
):
self._auth_method = "GitHub App Token"
self._auth_method = "GitHub App Key and ID"
elif environ.get("GITHUB_PERSONAL_ACCESS_TOKEN", ""):
self._auth_method = "Environment Variable for Personal Access Token"
elif environ.get("GITHUB_OAUTH_APP_TOKEN", ""):
self._auth_method = "Environment Variable for OAuth App Token"
elif environ.get("GITHUB_APP_ID", "") and environ.get("GITHUB_APP_KEY", ""):
elif environ.get("GITHUB_APP_ID", "") and (
environ.get("GITHUB_APP_KEY", "") or environ.get("GITHUB_APP_KEY_PATH", "")
):
self._auth_method = "Environment Variables for GitHub App Key and ID"
self._identity = GithubProvider.setup_identity(self._session)
@@ -347,13 +349,10 @@ class GithubProvider(Provider):
if env_key:
if env_key.startswith("-----BEGIN"):
app_key = format_rsa_key(env_key)
elif os.path.isfile(env_key):
with open(env_key, "r") as rsa_key:
app_key = rsa_key.read()
else:
raise GithubEnvironmentVariableError(
file=os.path.basename(__file__),
message="GITHUB_APP_KEY must contain either RSA key content (starting with -----BEGIN) or a valid file path.",
message="GITHUB_APP_KEY must contain RSA key content (starting with -----BEGIN). Use GITHUB_APP_KEY_PATH for file paths.",
)
if not session_token and not (app_id and app_key):
prowler/providers/github/lib/arguments/arguments.py
+1 -1
View File
@@ -34,7 +34,7 @@ def init_parser(self):
nargs="?",
help="GitHub App Key content (PEM format) to log in against GitHub",
default=None,
metavar="GITHUB_APP_KEY_CONTENT",
metavar="GITHUB_APP_KEY",
)
github_auth_subparser.add_argument(
"--github-app-key-path",
tests/providers/github/github_provider_test.py
+7 -5
View File
@@ -852,7 +852,7 @@ class TestGitHubProvider:
assert session.token == ""
def test_setup_session_with_github_app_key_env_var_file_path(self):
"""Test setup_session with GITHUB_APP_KEY environment variable containing file path."""
"""Test setup_session with GITHUB_APP_KEY environment variable containing file path should raise error."""
import os
import tempfile
@@ -877,11 +877,13 @@ class TestGitHubProvider:
if key in os.environ:
del os.environ[key]
session = GithubProvider.setup_session()
with pytest.raises(GithubSetUpSessionError) as exc_info:
GithubProvider.setup_session()
assert session.id == str(APP_ID)
assert session.key == key_content
assert session.token == ""
assert "GITHUB_APP_KEY must contain RSA key content" in str(
exc_info.value
)
assert "Use GITHUB_APP_KEY_PATH for file paths" in str(exc_info.value)
finally:
os.unlink(temp_path)