cycode 1.10.4.dev2__tar.gz → 1.10.5.dev1__tar.gz

{cycode-1.10.4.dev2 → cycode-1.10.5.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cycode
-Version: 1.10.4.dev2
+Version: 1.10.5.dev1
 Summary: Boost security in your dev lifecycle via SAST, SCA, Secrets & IaC scanning.
 Home-page: https://github.com/cycodehq/cycode-cli
 License: MIT

cycode-1.10.5.dev1/cycode/__init__.py

@@ -0,0 +1 @@
+__version__ = '1.10.5.dev1'  # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag

{cycode-1.10.4.dev2 → cycode-1.10.5.dev1}/cycode/cli/commands/main_cli.py

@@ -12,6 +12,7 @@ from cycode.cli.commands.version.version_command import version_command
 from cycode.cli.consts import (
     CLI_CONTEXT_SETTINGS,
 )
+from cycode.cli.sentry import add_breadcrumb, init_sentry
 from cycode.cli.user_settings.configuration_manager import ConfigurationManager
 from cycode.cli.utils.progress_bar import SCAN_PROGRESS_BAR_SECTIONS, get_progress_bar
 from cycode.cyclient.config import set_logging_level
@@ -60,6 +61,9 @@ from cycode.cyclient.models import UserAgentOptionScheme
 def main_cli(
     context: click.Context, verbose: bool, no_progress_meter: bool, output: str, user_agent: Optional[str]
 ) -> None:
+    init_sentry()
+    add_breadcrumb('cycode')
+
     context.ensure_object(dict)
     configuration_manager = ConfigurationManager()
 

{cycode-1.10.4.dev2 → cycode-1.10.5.dev1}/cycode/cli/main.py

@@ -5,7 +5,6 @@ from multiprocessing import freeze_support
 import pip_system_certs.wrapt_requests  # noqa: F401
 
 from cycode.cli.commands.main_cli import main_cli
-from cycode.cli.sentry import add_breadcrumb, init_sentry
 
 if __name__ == '__main__':
     # DO NOT REMOVE OR MOVE THIS LINE
@@ -13,7 +12,4 @@ if __name__ == '__main__':
     # see https://pyinstaller.org/en/latest/common-issues-and-pitfalls.html#multi-processing
     freeze_support()
 
-    init_sentry()
-    add_breadcrumb('cycode')
-
     main_cli()

{cycode-1.10.4.dev2 → cycode-1.10.5.dev1}/cycode/cli/sentry.py

@@ -51,6 +51,7 @@ def init_sentry() -> None:
         dsn=consts.SENTRY_DSN,
         debug=consts.SENTRY_DEBUG,
         release=_get_sentry_release(),
+        server_name='',
         before_send=_before_sentry_event_send,
         sample_rate=consts.SENTRY_SAMPLE_RATE,
         send_default_pii=consts.SENTRY_SEND_DEFAULT_PII,
@@ -61,7 +62,6 @@ def init_sentry() -> None:
             AtexitIntegration(lambda _, __: None)  # disable output to stderr about pending events
         ],
     )
-    sentry_sdk.set_user(None)
 
 
 def setup_scope_from_access_token(access_token: Optional[str]) -> None:

cycode-1.10.5.dev1/cycode/cli/utils/jwt_utils.py

@@ -0,0 +1,19 @@
+from typing import Optional, Tuple
+
+import jwt
+
+_JWT_PAYLOAD_POSSIBLE_USER_ID_FIELD_NAMES = ('userId', 'internalId', 'token-user-id')
+
+
+def get_user_and_tenant_ids_from_access_token(access_token: str) -> Tuple[Optional[str], Optional[str]]:
+    payload = jwt.decode(access_token, options={'verify_signature': False})
+
+    user_id = None
+    for field in _JWT_PAYLOAD_POSSIBLE_USER_ID_FIELD_NAMES:
+        user_id = payload.get(field)
+        if user_id:
+            break
+
+    tenant_id = payload.get('tenantId')
+
+    return user_id, tenant_id

{cycode-1.10.4.dev2 → cycode-1.10.5.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cycode"
-version = "1.10.4.dev2" # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag
+version = "1.10.5.dev1" # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag
 description = "Boost security in your dev lifecycle via SAST, SCA, Secrets & IaC scanning."
 keywords=["secret-scan", "cycode", "devops", "token", "secret", "security", "cycode", "code"]
 authors = ["Cycode <support@cycode.com>"]

cycode-1.10.4.dev2/cycode/__init__.py

@@ -1 +0,0 @@
-__version__ = '1.10.4.dev2'  # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag

cycode-1.10.4.dev2/cycode/cli/utils/jwt_utils.py

@@ -1,14 +0,0 @@
-from typing import Tuple
-
-import jwt
-
-
-def get_user_and_tenant_ids_from_access_token(access_token: str) -> Tuple[str, str]:
-    payload = jwt.decode(access_token, options={'verify_signature': False})
-    user_id = payload.get('userId')
-    tenant_id = payload.get('tenantId')
-
-    if not user_id or not tenant_id:
-        raise ValueError('Invalid access token')
-
-    return user_id, tenant_id