assemblyline 4.5.1.dev0__tar.gz → 4.5.1.dev4__tar.gz

{assemblyline-4.5.1.dev0/assemblyline.egg-info → assemblyline-4.5.1.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: assemblyline
-Version: 4.5.1.dev0
+Version: 4.5.1.dev4
 Summary: Assemblyline 4 - Automated malware analysis framework
 Home-page: https://github.com/CybercentreCanada/assemblyline-base
 Author: CCCS Assemblyline development team
@@ -33,7 +33,7 @@ This is Assemblyline 4 base repository. It provides Assemblyline with common lib
 
 #### System requirements
 
-Assemblyline 4 will only work on systems running python3.9 and was only tested on linux systems.
+Assemblyline 4 will only work on systems running python3.11 and was only tested on linux systems.
 
 #### Installation requirements
 
@@ -42,7 +42,7 @@ If used outside of our normal container this library requires outside linux libr
 - libffi8 (dev)
 - libfuxxy2 (dev)
 - libmagic1
-- python3.9 (dev)
+- python3.11 (dev)
 
 Here is an example on how you would get those libraries on a `Ubuntu 20.04+` system:
 

{assemblyline-4.5.1.dev0 → assemblyline-4.5.1.dev4}/README.md

@@ -10,7 +10,7 @@ This is Assemblyline 4 base repository. It provides Assemblyline with common lib
 
 #### System requirements
 
-Assemblyline 4 will only work on systems running python3.9 and was only tested on linux systems.
+Assemblyline 4 will only work on systems running python3.11 and was only tested on linux systems.
 
 #### Installation requirements
 
@@ -19,7 +19,7 @@ If used outside of our normal container this library requires outside linux libr
 - libffi8 (dev)
 - libfuxxy2 (dev)
 - libmagic1
-- python3.9 (dev)
+- python3.11 (dev)
 
 Here is an example on how you would get those libraries on a `Ubuntu 20.04+` system:
 

assemblyline-4.5.1.dev4/assemblyline/VERSION

@@ -0,0 +1 @@
+4.5.1.dev4

{assemblyline-4.5.1.dev0 → assemblyline-4.5.1.dev4}/assemblyline/datastore/support/build.py

@@ -1,4 +1,5 @@
-from assemblyline.odm import Keyword, Text, List, Compound, Date, Integer, \
+from assemblyline.odm.base import _Field
+from assemblyline.odm import Keyword, Text, List, Compound, Date, Integer, Long, \
     Float, Boolean, Mapping, Classification, Enum, Any, UUID, Optional, IP, Domain, URI, URIPath, MAC, PhoneNumber, \
     SSDeepHash, SHA1, SHA256, MD5, Platform, Processor, ClassificationString, FlattenedObject, Email, UpperKeyword, \
     Json, ValidatedKeyword, UNCPath
@@ -8,6 +9,7 @@ __type_mapping = {
     Keyword: 'keyword',
     Boolean: 'boolean',
     Integer: 'integer',
+    Long: 'long',
     Float: 'float',
     Date: 'date',
     Text: 'text',
@@ -61,8 +63,10 @@ def build_mapping(field_data, prefix=None, allow_refuse_implicit=True):
     mappings = {}
     dynamic = []
 
-    def set_mapping(temp_field, body):
+    def set_mapping(temp_field: _Field, body):
         body['index'] = temp_field.index
+        if temp_field.store is not None:
+            body['store'] = temp_field.store
         if body.get('type', 'text') != 'text':
             body['doc_values'] = temp_field.index
         if temp_field.copyto:
@@ -96,7 +100,7 @@ def build_mapping(field_data, prefix=None, allow_refuse_implicit=True):
                         'index': True},
                 })
 
-        elif isinstance(field, (Boolean, Integer, Float, Text)):
+        elif isinstance(field, (Boolean, Integer, Long, Float, Text)):
             mappings[name.strip(".")] = set_mapping(field, {
                 'type': __type_mapping[field.__class__]
             })

{assemblyline-4.5.1.dev0 → assemblyline-4.5.1.dev4}/assemblyline/odm/__init__.py

@@ -5,7 +5,7 @@ from assemblyline.odm.base import *
 
 # Imports that have the same effect as some part of the one above so that
 # type checking can use this file properly.
-from assemblyline.odm.base import Keyword, Optional, Boolean, Integer, List, Compound, Mapping, Date, Enum
+from assemblyline.odm.base import Keyword, Optional, Boolean, Integer, Long, List, Compound, Mapping, Date, Enum
 from datetime import datetime
 
 _InnerType = typing.TypeVar("_InnerType")
@@ -43,6 +43,10 @@ def integer(*args, **kwargs) -> int:
     return typing.cast(int, Integer(*args, **kwargs))
 
 
+def long(*args, **kwargs) -> int:
+    return typing.cast(int, Long(*args, **kwargs))
+
+
 def sequence(child_type: _InnerType, **kwargs) -> list[_InnerType]:
     return typing.cast(list[_InnerType], List(child_type, **kwargs))
 

{assemblyline-4.5.1.dev0 → assemblyline-4.5.1.dev4}/assemblyline/odm/base.py

@@ -667,6 +667,37 @@ class Integer(_Field):
         return ret_val
 
 
+class Long(_Field):
+    """A field storing an integer value."""
+
+    def __init__(self, max: int = None, min: int = None, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.max = max
+        self.min = min
+
+    def check(self, value, **kwargs):
+        if self.optional and value is None:
+            return None
+
+        if value is None or value == "":
+            if self.default_set:
+                ret_val = self.default
+            else:
+                raise ValueError(f"[{self.name or self.parent_name}] No value provided and no default value set.")
+        else:
+            ret_val = int(value)
+
+        # Test min/max
+        if self.max is not None and ret_val > self.max:
+            raise ValueError(
+                f"[{self.name or self.parent_name}] Value bigger then the max value. ({value} > {self.max})")
+        if self.min is not None and ret_val < self.min:
+            raise ValueError(
+                f"[{self.name or self.parent_name}] Value smaller then the min value. ({value} < {self.max})")
+
+        return ret_val
+
+
 class Float(_Field):
     """A field storing a floating point value."""
 

{assemblyline-4.5.1.dev0 → assemblyline-4.5.1.dev4}/assemblyline/odm/models/config.py

@@ -1502,7 +1502,7 @@ DEFAULT_RETROHUNT = {
     'enabled': False,
     'dtl': 30,
     'max_dtl': 0,
-    'url': 'https://hauntedhouse.hauntedhouse.svc.cluster.local:4443',
+    'url': 'https://hauntedhouse:4443',
     'api_key': "ChangeThisDefaultRetroHuntAPIKey!",
     'tls_verify': True
 }

{assemblyline-4.5.1.dev0 → assemblyline-4.5.1.dev4}/assemblyline/odm/models/file.py

@@ -84,5 +84,5 @@ class File(odm.Model):
     ssdeep = odm.SSDeepHash(store=False, description="SSDEEP hash of the file", ai=False)
     type = odm.Keyword(copyto="__text__", description="Type of file as identified by Assemblyline")
     tlsh = odm.Optional(odm.Keyword(copyto="__text__", description="TLSH hash of the file", ai=False))
-    from_archive = odm.Boolean(index=False, default=False, description="Was loaded from the archive", ai=False)
+    from_archive = odm.Boolean(index=False, store=False, default=False, description="Was loaded from the archive", ai=False)
     uri_info = odm.Optional(odm.Compound(URIInfo), description="URI structure to speed up specialty file searching")

{assemblyline-4.5.1.dev0 → assemblyline-4.5.1.dev4}/assemblyline/odm/models/retrohunt.py

@@ -19,8 +19,8 @@ class Retrohunt(odm.Model):
     description = odm.Text(copyto="__text__", description="Human readable description of this retrohunt job")
     expiry_ts = odm.Optional(odm.Date(store=False), description="Expiry timestamp of this retrohunt job")
 
-    start_group = odm.integer(description="Earliest expiry group this search will include")
-    end_group = odm.integer(description="Latest expiry group this search will include")
+    start_group = odm.long(description="Earliest expiry group this search will include")
+    end_group = odm.long(description="Latest expiry group this search will include")
     
     created_time = odm.date(description="Start time for the search.")
     started_time = odm.date(description="Start time for the search.")

{assemblyline-4.5.1.dev0 → assemblyline-4.5.1.dev4}/assemblyline/odm/randomizer.py

@@ -6,7 +6,7 @@ from typing import Optional as _Optional, Dict, Any as _Any
 from assemblyline.common.uid import get_random_id
 from assemblyline.odm import Boolean, Enum, Keyword, Text, List, Model, Compound, Integer, Float, Date, Mapping, \
     Classification, ClassificationString, Optional, Any, forge, IP, Domain, MD5, SHA1, SHA256, PhoneNumber, MAC, \
-    URIPath, URI, SSDeepHash, Email, Platform, Processor, UpperKeyword, Json, EmptyableKeyword, UNCPath
+    URIPath, URI, SSDeepHash, Email, Platform, Processor, UpperKeyword, Json, EmptyableKeyword, UNCPath, Long
 from assemblyline.odm.models.tagging import Tagging
 
 config = forge.get_config()
@@ -313,7 +313,7 @@ def random_data_for_field(field, name: str, minimal: bool = False) -> _Any:
             return field.child_type.default
     elif isinstance(field, Date):
         return get_random_iso_date()
-    elif isinstance(field, Integer):
+    elif isinstance(field, (Integer, Long)):
         if name == 'depth':
             return random.randint(1, 3)
         return random.randint(128, 4096)

{assemblyline-4.5.1.dev0 → assemblyline-4.5.1.dev4/assemblyline.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: assemblyline
-Version: 4.5.1.dev0
+Version: 4.5.1.dev4
 Summary: Assemblyline 4 - Automated malware analysis framework
 Home-page: https://github.com/CybercentreCanada/assemblyline-base
 Author: CCCS Assemblyline development team
@@ -33,7 +33,7 @@ This is Assemblyline 4 base repository. It provides Assemblyline with common lib
 
 #### System requirements
 
-Assemblyline 4 will only work on systems running python3.9 and was only tested on linux systems.
+Assemblyline 4 will only work on systems running python3.11 and was only tested on linux systems.
 
 #### Installation requirements
 
@@ -42,7 +42,7 @@ If used outside of our normal container this library requires outside linux libr
 - libffi8 (dev)
 - libfuxxy2 (dev)
 - libmagic1
-- python3.9 (dev)
+- python3.11 (dev)
 
 Here is an example on how you would get those libraries on a `Ubuntu 20.04+` system:
 

assemblyline-4.5.1.dev0/assemblyline/VERSION

@@ -1 +0,0 @@
-4.5.1.dev0