assemblyline-v4-service 4.6.1.dev37__py3-none-any.whl → 4.6.1.dev38__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of assemblyline-v4-service might be problematic. Click here for more details.
- assemblyline_v4_service/VERSION +1 -1
- assemblyline_v4_service/updater/helper.py +19 -3
- {assemblyline_v4_service-4.6.1.dev37.dist-info → assemblyline_v4_service-4.6.1.dev38.dist-info}/METADATA +1 -1
- {assemblyline_v4_service-4.6.1.dev37.dist-info → assemblyline_v4_service-4.6.1.dev38.dist-info}/RECORD +7 -7
- {assemblyline_v4_service-4.6.1.dev37.dist-info → assemblyline_v4_service-4.6.1.dev38.dist-info}/WHEEL +1 -1
- {assemblyline_v4_service-4.6.1.dev37.dist-info → assemblyline_v4_service-4.6.1.dev38.dist-info}/licenses/LICENCE.md +0 -0
- {assemblyline_v4_service-4.6.1.dev37.dist-info → assemblyline_v4_service-4.6.1.dev38.dist-info}/top_level.txt +0 -0
assemblyline_v4_service/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
4.6.1.
|
|
1
|
+
4.6.1.dev38
|
|
@@ -12,6 +12,7 @@ import psutil
|
|
|
12
12
|
import regex as re
|
|
13
13
|
import requests
|
|
14
14
|
from git import Repo
|
|
15
|
+
from azure.identity import DefaultAzureCredential
|
|
15
16
|
|
|
16
17
|
from assemblyline.common.digests import get_sha256_for_file
|
|
17
18
|
from assemblyline.common.identify import Identify
|
|
@@ -187,6 +188,7 @@ def git_clone_repo(source: Dict[str, Any], previous_update: int = None, logger=N
|
|
|
187
188
|
name = source['name']
|
|
188
189
|
url = source['uri']
|
|
189
190
|
key = source.get('private_key', None)
|
|
191
|
+
use_managed_identity = source.get('use_managed_identity', False)
|
|
190
192
|
username = source.get('username', None)
|
|
191
193
|
password = source.get('password', None)
|
|
192
194
|
branch = source.get('git_branch', None) or None
|
|
@@ -195,15 +197,29 @@ def git_clone_repo(source: Dict[str, Any], previous_update: int = None, logger=N
|
|
|
195
197
|
ca_cert = source.get("ca_cert")
|
|
196
198
|
proxy = source.get('proxy', None)
|
|
197
199
|
auth = None
|
|
198
|
-
|
|
200
|
+
git_env = {}
|
|
201
|
+
|
|
202
|
+
if use_managed_identity:
|
|
203
|
+
# Get Azure managed identity token
|
|
204
|
+
try:
|
|
205
|
+
credential = DefaultAzureCredential()
|
|
206
|
+
except Exception as e:
|
|
207
|
+
logger.warning(f"No managed identity available: {str(e)}")
|
|
208
|
+
raise SkipSource()
|
|
209
|
+
# Get token for Azure DevOps scope
|
|
210
|
+
token = credential.get_token("499b84ac-1321-427f-aa17-267ca6975798/.default")
|
|
211
|
+
|
|
212
|
+
git_env['GIT_CONFIG_COUNT'] = '1'
|
|
213
|
+
git_env['GIT_CONFIG_KEY_0'] = 'http.extraheader'
|
|
214
|
+
git_env['GIT_CONFIG_VALUE_0'] = f'AUTHORIZATION: bearer {token.token}'
|
|
215
|
+
auth = None
|
|
216
|
+
elif username and password:
|
|
199
217
|
# Basic authentication scheme
|
|
200
218
|
auth = f'{username}:{password}@'
|
|
201
219
|
elif password:
|
|
202
220
|
# Token-based authentication
|
|
203
221
|
auth = f'{password}@'
|
|
204
222
|
|
|
205
|
-
git_env = {}
|
|
206
|
-
|
|
207
223
|
if ignore_ssl_errors:
|
|
208
224
|
git_env['GIT_SSL_NO_VERIFY'] = '1'
|
|
209
225
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
assemblyline_v4_service/VERSION,sha256=
|
|
1
|
+
assemblyline_v4_service/VERSION,sha256=GNLqltLDyHyzPFE3-JsZyxVNag7a5KhtR4JGYw2nsTI,12
|
|
2
2
|
assemblyline_v4_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
3
3
|
assemblyline_v4_service/healthz.py,sha256=3QGBg0EZuXC6UN411HFwpLNEop9UvS9feFhvBUTP-k4,1576
|
|
4
4
|
assemblyline_v4_service/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
@@ -22,9 +22,9 @@ assemblyline_v4_service/updater/__main__.py,sha256=9Os-u8Tf7MD73JSrUSPmOaErTgfve
|
|
|
22
22
|
assemblyline_v4_service/updater/app.py,sha256=Mtmx4bkXfP4nFqqa5q15jW8QIXr4JK84lCovxAVyvPs,3317
|
|
23
23
|
assemblyline_v4_service/updater/client.py,sha256=tLY84gaGdFBVIDaMgRHIEa7x2S8jBl7lQLzp4seC6aI,11200
|
|
24
24
|
assemblyline_v4_service/updater/gunicorn_config.py,sha256=p3j2KPBeD5jvMw9O5i7vAtlRgPSVVxIG9AO0DfN82J8,1247
|
|
25
|
-
assemblyline_v4_service/updater/helper.py,sha256=
|
|
25
|
+
assemblyline_v4_service/updater/helper.py,sha256=GeXrfuPQL0RB5IGcgvx30vcCEehUueorw6SMSExjE9Q,10751
|
|
26
26
|
assemblyline_v4_service/updater/updater.py,sha256=kli-5v1uVmk2FARAI9DsZ9YM4EhgirkmWJaMJWdm9GI,31795
|
|
27
|
-
assemblyline_v4_service-4.6.1.
|
|
27
|
+
assemblyline_v4_service-4.6.1.dev38.dist-info/licenses/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
|
|
28
28
|
test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
29
29
|
test/conftest.py,sha256=W3SieQpZsZpGEmtLqY4aIlxREDSsHceyCrFcFsWUM0U,1851
|
|
30
30
|
test/test_healthz.py,sha256=DkeLUlrb7rGx3nZ04aADU9HXXu5mZTf_DBwT0xhzIv4,7
|
|
@@ -40,7 +40,7 @@ test/test_common/test_request.py,sha256=Ceyds8BNO1O0f1kH1VEb84faJcaupvSjVKIrGdHe
|
|
|
40
40
|
test/test_common/test_result.py,sha256=6BiOKxEPrKBjOY44jv3TY-yiXm0qI1ok_CZBnjP9TM4,45447
|
|
41
41
|
test/test_common/test_task.py,sha256=P44mNcSe-3tJgDk9ppN3KbM7oN4LBVIuhONG-Gveh74,19007
|
|
42
42
|
test/test_common/test_utils.py,sha256=TbnBxqpS_ZC5ptXR9XJX3xtbItD0mTbtiBxxdyP8J5k,5904
|
|
43
|
-
assemblyline_v4_service-4.6.1.
|
|
44
|
-
assemblyline_v4_service-4.6.1.
|
|
45
|
-
assemblyline_v4_service-4.6.1.
|
|
46
|
-
assemblyline_v4_service-4.6.1.
|
|
43
|
+
assemblyline_v4_service-4.6.1.dev38.dist-info/METADATA,sha256=aCTvNPkORjJOuPWfQKv6yEOMoTQGm1-IqYkvjegvrCI,5624
|
|
44
|
+
assemblyline_v4_service-4.6.1.dev38.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
|
|
45
|
+
assemblyline_v4_service-4.6.1.dev38.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
|
|
46
|
+
assemblyline_v4_service-4.6.1.dev38.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|