assemblyline-v4-service 4.5.1.dev164__py3-none-any.whl → 4.5.1.dev165__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.

Files changed (7) hide show
  1. assemblyline_v4_service/VERSION +1 -1
  2. assemblyline_v4_service/updater/updater.py +12 -3
  3. {assemblyline_v4_service-4.5.1.dev164.dist-info → assemblyline_v4_service-4.5.1.dev165.dist-info}/METADATA +1 -1
  4. {assemblyline_v4_service-4.5.1.dev164.dist-info → assemblyline_v4_service-4.5.1.dev165.dist-info}/RECORD +7 -7
  5. {assemblyline_v4_service-4.5.1.dev164.dist-info → assemblyline_v4_service-4.5.1.dev165.dist-info}/LICENCE.md +0 -0
  6. {assemblyline_v4_service-4.5.1.dev164.dist-info → assemblyline_v4_service-4.5.1.dev165.dist-info}/WHEEL +0 -0
  7. {assemblyline_v4_service-4.5.1.dev164.dist-info → assemblyline_v4_service-4.5.1.dev165.dist-info}/top_level.txt +0 -0
assemblyline_v4_service/VERSION CHANGED
@@ -1 +1 @@
1
- 4.5.1.dev164
1
+ 4.5.1.dev165
assemblyline_v4_service/updater/updater.py CHANGED
@@ -320,11 +320,20 @@ class ServiceUpdater(ThreadedCoreBase):
320
320
 
321
321
  if self._service.update_config.generates_signatures:
322
322
  output_directory = tempfile.mkdtemp(prefix="update_dir_", dir=UPDATER_DIR)
323
+ sources_removed_locally = False
324
+ if self._update_dir:
325
+ current_update_dir = os.path.join(self._update_dir, self.updater_type)
323
326
 
324
- # Check if new signatures have been added
327
+ if os.path.exists(current_update_dir):
328
+ sources_removed_locally = set(os.listdir(current_update_dir)) - \
329
+ set([s.name for s in self._service.update_config.sources])
330
+
331
+
332
+ # Check if new signatures have been added (or it there's been a local change since the last update)
325
333
  self.log.info("Check for new signatures.")
326
- if self.client.signature.update_available(since=epoch_to_iso(old_update_time) or None,
327
- sig_type=self.updater_type):
334
+ if sources_removed_locally or \
335
+ self.client.signature.update_available(since=epoch_to_iso(old_update_time) or None,
336
+ sig_type=self.updater_type):
328
337
  self.log.info("An update is available for download from the datastore")
329
338
 
330
339
  self.log.debug(f"{self.updater_type} update available since {epoch_to_iso(old_update_time) or ''}")
{assemblyline_v4_service-4.5.1.dev164.dist-info → assemblyline_v4_service-4.5.1.dev165.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: assemblyline-v4-service
3
- Version: 4.5.1.dev164
3
+ Version: 4.5.1.dev165
4
4
  Summary: Assemblyline 4 - Service base
5
5
  Home-page: https://github.com/CybercentreCanada/assemblyline-v4-service/
6
6
  Author: CCCS Assemblyline development team
{assemblyline_v4_service-4.5.1.dev164.dist-info → assemblyline_v4_service-4.5.1.dev165.dist-info}/RECORD RENAMED
@@ -1,4 +1,4 @@
1
- assemblyline_v4_service/VERSION,sha256=_5OxrtZBzV7eXEelk9nkHYtTysGaWHKvBz8t8GEjXX4,13
1
+ assemblyline_v4_service/VERSION,sha256=gQ_U5ZI-XJ8j3jTzG_O9CJYqhEr3JyFO031PkPgz1ws,13
2
2
  assemblyline_v4_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
3
3
  assemblyline_v4_service/healthz.py,sha256=sS1cFkDLw8hUPMpj7tbHXFv8ZmHcazrwZ0l6oQDwwkQ,1575
4
4
  assemblyline_v4_service/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -22,7 +22,7 @@ assemblyline_v4_service/updater/app.py,sha256=Mtmx4bkXfP4nFqqa5q15jW8QIXr4JK84lC
22
22
  assemblyline_v4_service/updater/client.py,sha256=oOOIzh-Q-b5uOTo3C4rVSfQxqUO5Y_ogDmUhvWfm5uo,9518
23
23
  assemblyline_v4_service/updater/gunicorn_config.py,sha256=p3j2KPBeD5jvMw9O5i7vAtlRgPSVVxIG9AO0DfN82J8,1247
24
24
  assemblyline_v4_service/updater/helper.py,sha256=-B35wdjpeY4t1R9SPDrTFHFKHwE3uzy9N69mV6mHy-g,9532
25
- assemblyline_v4_service/updater/updater.py,sha256=5cJH82VTP3VrwoNE97ubKP2dr90AI_T-AKRistvN5rI,29013
25
+ assemblyline_v4_service/updater/updater.py,sha256=6LFvqBkNu6mDaBKZGEaFGtE8g3DtDNBYWt8jXx6fnOw,29507
26
26
  test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
27
27
  test/conftest.py,sha256=W3SieQpZsZpGEmtLqY4aIlxREDSsHceyCrFcFsWUM0U,1851
28
28
  test/test_healthz.py,sha256=DkeLUlrb7rGx3nZ04aADU9HXXu5mZTf_DBwT0xhzIv4,7
@@ -38,8 +38,8 @@ test/test_common/test_request.py,sha256=Ceyds8BNO1O0f1kH1VEb84faJcaupvSjVKIrGdHe
38
38
  test/test_common/test_result.py,sha256=6BiOKxEPrKBjOY44jv3TY-yiXm0qI1ok_CZBnjP9TM4,45447
39
39
  test/test_common/test_task.py,sha256=P44mNcSe-3tJgDk9ppN3KbM7oN4LBVIuhONG-Gveh74,19007
40
40
  test/test_common/test_utils.py,sha256=TbnBxqpS_ZC5ptXR9XJX3xtbItD0mTbtiBxxdyP8J5k,5904
41
- assemblyline_v4_service-4.5.1.dev164.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
42
- assemblyline_v4_service-4.5.1.dev164.dist-info/METADATA,sha256=93jLyR3PZXOA0df3zUg4sU4mwbXhDJL_CTclS_g9BrY,9499
43
- assemblyline_v4_service-4.5.1.dev164.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
44
- assemblyline_v4_service-4.5.1.dev164.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
45
- assemblyline_v4_service-4.5.1.dev164.dist-info/RECORD,,
41
+ assemblyline_v4_service-4.5.1.dev165.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
42
+ assemblyline_v4_service-4.5.1.dev165.dist-info/METADATA,sha256=n81OEe5lzqy4qVA0430X5ld7HLr8HOAF25Ft9D9mQCE,9499
43
+ assemblyline_v4_service-4.5.1.dev165.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
44
+ assemblyline_v4_service-4.5.1.dev165.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
45
+ assemblyline_v4_service-4.5.1.dev165.dist-info/RECORD,,