Merge branch 'master' into add-swimlane

.github/workflows/python36.yml

@@ -2,9 +2,9 @@ name: 3.6 EOL
 
 on:
   push:
-    branches: [ '*' ]
+    branches: [ 'none' ]
   pull_request:
-    branches: [ '*' ]
+    branches: [ 'none' ]
 
 env:
   # Use docker.io for Docker Hub if empty

.github/workflows/python37.yml

@@ -2,9 +2,9 @@ name: 3.7 EOL
 
 on:
   push:
-    branches: [ '*' ]
+    branches: [ 'none' ]
   pull_request:
-    branches: [ '*' ]
+    branches: [ 'none' ]
 
 env:
   # Use docker.io for Docker Hub if empty

.github/workflows/python38.yml

@@ -2,9 +2,9 @@ name: 3.8
 
 on:
   push:
-    branches: [ '*' ]
+    branches: [ 'none' ]
   pull_request:
-    branches: [ '*' ]
+    branches: [ 'none' ]
 
 env:
   # Use docker.io for Docker Hub if empty

.github/workflows/python39.yml

@@ -2,9 +2,9 @@ name: 3.9
 
 on:
   push:
-    branches: [ '*' ]
+    branches: [ 'none' ]
   pull_request:
-    branches: [ '*' ]
+    branches: [ 'none' ]
 
 env:
   # Use docker.io for Docker Hub if empty

README.md

@@ -45,30 +45,17 @@ Github issues and feature requests welcomed.
 | Data Store      | minio<br/>swift                                             |
 | Devices         | snmp                                                        |
 | Google Cloud    | google auth api<br/>google people api<br/>google sheets api |
+| Helpers         | os<br/>subprocess<br/>threading<br/>socket<br/>datetime     |
 | Logging         | sentryio                                                    |
 | MacOS           | airport<br/>macchanger                                      |
 | Python          | logging<br/>requests                                        |
 | SOAR            | swimlane<br/>splunk soar                                    |
 | Recon           | nmap                                                        |
 | Test Automation | selenium                                                    |
-| Category          | Library                                                     |
-|-------------------|-------------------------------------------------------------|
-| API               | flask                                                       |
-| Chat              | slack                                                       |
-| Data Scraping     | beautifulsoup<br/>facebook groups<br/>instagram<br/>scrapy  |
-| Databases         | elasticsearch<br/>neo4j<br/>splunk                          |
-| Data Store        | minio<br/>swift                                             |
-| Devices           | snmp                                                        |
-| Google Cloud      | google auth api<br/>google people api<br/>google sheets api |
-| Tracing / Logging | openTelemetry<br/>sentryio                                  |
-| macOS             | airport<br/>macchanger                                      |
-| Python            | logging<br/>requests                                        |
-| Recon             | nmap                                                        |
-| Test Automation   | selenium                                                    |
 
 #### Requires
 
-- python >= 3.8
+- python >= 3.10
 
 _Note: install requirements.txt to use all integrations_
 

automon/helpers/__init__.py

@@ -1,5 +1,6 @@
 from .dates import Dates
 from .markdown import Chat, Format
+from .networking import Networking
 from .osWrapper import environ
 from .sleeper import Sleeper
 from .subprocessWrapper import Run

automon/helpers/regex.py

@@ -1,16 +1,13 @@
 import re
 
-from automon.helpers import assertions
-from automon.helpers.grok import GrokLegacy
-
 
 def geolocation(string):
     """Parse any kind of geolocation data"""
 
     # TODO: parse any geolocation info (long, lat)
 
     pattern = [
-        '([Long]{4}:[ ]?[0-9\.]*,[ ]?[Lat]{3}:[ ]?[0-9\.]*)'
+        r'([Long]{4}:[ ]?[0-9\.]*,[ ]?[Lat]{3}:[ ]?[0-9\.]*)'
     ]
 
     for p in pattern:
@@ -19,45 +16,3 @@ def geolocation(string):
 
         if r:
             return r
-
-
-class Magic:
-
-    @staticmethod
-    def magic_box(data: str) -> dict:
-        """Do some grok magic on anything given and find everything"""
-
-        all_matches = dict()
-        grok = GrokLegacy.g
-
-        for pattern in grok:
-
-            try:
-                compile_regex = re.compile(grok[pattern])  # compiled regex from g dict
-                result = re.findall(compile_regex, data)  # regex search result
-
-                if result:
-                    list_results = []
-
-                    if assertions.assert_list(result):
-                        _list = result
-                        for _item in _list:
-
-                            if assertions.assert_tuple(_item):
-                                _tuple = _item
-                                for _item2 in _tuple:
-                                    if len(_item2) > 0:
-                                        list_results.append(_item2)
-
-                            elif assertions.assert_string(_item):
-                                if len(_item) > 0:
-                                    list_results.append(_item)
-
-                    if len(list_results) > 0:
-                        all_matches[pattern] = list_results
-
-            except Exception as err:
-                # print('[!] Failed pattern: ' + grok_all_string[p] + ' => ' + str(err))
-                pass
-
-        return all_matches