Merge pull request #20 from advanced-security/fix-depgraph

Update Dependencies to fix issue

Author: GeekMasher

Pipfile

@@ -5,12 +5,13 @@ verify_ssl = true
 
 [packages]
 pyyaml = "*"
-ghastoolkit = "==0.2.1"
+ghastoolkit = "*"
 
 [dev-packages]
 sphinx = "*"
 myst-parser = "*"
 black = "*"
+typing_extensions = "*"
 
 [scripts]
 main = "python -m ghascompliance"

Pipfile.lock

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-__version__ = "2.3.0"
+__version__ = "2.3.1"
 
 __title__ = "GitHub Advanced Security Policy as Code"
 __name__ = "ghascompliance"

ghascompliance/__version__.py

@@ -1,4 +1,4 @@
 from .core import contents, where
 
 __all__ = ["contents", "where"]
-__version__ = "2022.12.07"
+__version__ = "2023.05.07"

vendor/certifi/__init__.py

@@ -4525,3 +4525,65 @@ BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjAVXUI9/Lbu
 9zuxNuie9sRGKEkz0FhDKmMpzE2xtHqiuQ04pV1IKv3LsnNdo4gIxwwCMQDAqy0O
 be0YottT6SXbVQjgUMzfRGEWgqtJsLKB7HOHeLRMsmIbEvoWTSVLY70eN9k=
 -----END CERTIFICATE-----
+
+# Issuer: CN=BJCA Global Root CA1 O=BEIJING CERTIFICATE AUTHORITY
+# Subject: CN=BJCA Global Root CA1 O=BEIJING CERTIFICATE AUTHORITY
+# Label: "BJCA Global Root CA1"
+# Serial: 113562791157148395269083148143378328608
+# MD5 Fingerprint: 42:32:99:76:43:33:36:24:35:07:82:9b:28:f9:d0:90
+# SHA1 Fingerprint: d5:ec:8d:7b:4c:ba:79:f4:e7:e8:cb:9d:6b:ae:77:83:10:03:21:6a
+# SHA256 Fingerprint: f3:89:6f:88:fe:7c:0a:88:27:66:a7:fa:6a:d2:74:9f:b5:7a:7f:3e:98:fb:76:9c:1f:a7:b0:9c:2c:44:d5:ae
+-----BEGIN CERTIFICATE-----
+MIIFdDCCA1ygAwIBAgIQVW9l47TZkGobCdFsPsBsIDANBgkqhkiG9w0BAQsFADBU
+MQswCQYDVQQGEwJDTjEmMCQGA1UECgwdQkVJSklORyBDRVJUSUZJQ0FURSBBVVRI
+T1JJVFkxHTAbBgNVBAMMFEJKQ0EgR2xvYmFsIFJvb3QgQ0ExMB4XDTE5MTIxOTAz
+MTYxN1oXDTQ0MTIxMjAzMTYxN1owVDELMAkGA1UEBhMCQ04xJjAkBgNVBAoMHUJF
+SUpJTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZMR0wGwYDVQQDDBRCSkNBIEdsb2Jh
+bCBSb290IENBMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPFmCL3Z
+xRVhy4QEQaVpN3cdwbB7+sN3SJATcmTRuHyQNZ0YeYjjlwE8R4HyDqKYDZ4/N+AZ
+spDyRhySsTphzvq3Rp4Dhtczbu33RYx2N95ulpH3134rhxfVizXuhJFyV9xgw8O5
+58dnJCNPYwpj9mZ9S1WnP3hkSWkSl+BMDdMJoDIwOvqfwPKcxRIqLhy1BDPapDgR
+at7GGPZHOiJBhyL8xIkoVNiMpTAK+BcWyqw3/XmnkRd4OJmtWO2y3syJfQOcs4ll
+5+M7sSKGjwZteAf9kRJ/sGsciQ35uMt0WwfCyPQ10WRjeulumijWML3mG90Vr4Tq
+nMfK9Q7q8l0ph49pczm+LiRvRSGsxdRpJQaDrXpIhRMsDQa4bHlW/KNnMoH1V6XK
+V0Jp6VwkYe/iMBhORJhVb3rCk9gZtt58R4oRTklH2yiUAguUSiz5EtBP6DF+bHq/
+pj+bOT0CFqMYs2esWz8sgytnOYFcuX6U1WTdno9uruh8W7TXakdI136z1C2OVnZO
+z2nxbkRs1CTqjSShGL+9V/6pmTW12xB3uD1IutbB5/EjPtffhZ0nPNRAvQoMvfXn
+jSXWgXSHRtQpdaJCbPdzied9v3pKH9MiyRVVz99vfFXQpIsHETdfg6YmV6YBW37+
+WGgHqel62bno/1Afq8K0wM7o6v0PvY1NuLxxAgMBAAGjQjBAMB0GA1UdDgQWBBTF
+7+3M2I0hxkjk49cULqcWk+WYATAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
+AwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAUoKsITQfI/Ki2Pm4rzc2IInRNwPWaZ+4
+YRC6ojGYWUfo0Q0lHhVBDOAqVdVXUsv45Mdpox1NcQJeXyFFYEhcCY5JEMEE3Kli
+awLwQ8hOnThJdMkycFRtwUf8jrQ2ntScvd0g1lPJGKm1Vrl2i5VnZu69mP6u775u
++2D2/VnGKhs/I0qUJDAnyIm860Qkmss9vk/Ves6OF8tiwdneHg56/0OGNFK8YT88
+X7vZdrRTvJez/opMEi4r89fO4aL/3Xtw+zuhTaRjAv04l5U/BXCga99igUOLtFkN
+SoxUnMW7gZ/NfaXvCyUeOiDbHPwfmGcCCtRzRBPbUYQaVQNW4AB+dAb/OMRyHdOo
+P2gxXdMJxy6MW2Pg6Nwe0uxhHvLe5e/2mXZgLR6UcnHGCyoyx5JO1UbXHfmpGQrI
++pXObSOYqgs4rZpWDW+N8TEAiMEXnM0ZNjX+VVOg4DwzX5Ze4jLp3zO7Bkqp2IRz
+znfSxqxx4VyjHQy7Ct9f4qNx2No3WqB4K/TUfet27fJhcKVlmtOJNBir+3I+17Q9
+eVzYH6Eze9mCUAyTF6ps3MKCuwJXNq+YJyo5UOGwifUll35HaBC07HPKs5fRJNz2
+YqAo07WjuGS3iGJCz51TzZm+ZGiPTx4SSPfSKcOYKMryMguTjClPPGAyzQWWYezy
+r/6zcCwupvI=
+-----END CERTIFICATE-----
+
+# Issuer: CN=BJCA Global Root CA2 O=BEIJING CERTIFICATE AUTHORITY
+# Subject: CN=BJCA Global Root CA2 O=BEIJING CERTIFICATE AUTHORITY
+# Label: "BJCA Global Root CA2"
+# Serial: 58605626836079930195615843123109055211
+# MD5 Fingerprint: 5e:0a:f6:47:5f:a6:14:e8:11:01:95:3f:4d:01:eb:3c
+# SHA1 Fingerprint: f4:27:86:eb:6e:b8:6d:88:31:67:02:fb:ba:66:a4:53:00:aa:7a:a6
+# SHA256 Fingerprint: 57:4d:f6:93:1e:27:80:39:66:7b:72:0a:fd:c1:60:0f:c2:7e:b6:6d:d3:09:29:79:fb:73:85:64:87:21:28:82
+-----BEGIN CERTIFICATE-----
+MIICJTCCAaugAwIBAgIQLBcIfWQqwP6FGFkGz7RK6zAKBggqhkjOPQQDAzBUMQsw
+CQYDVQQGEwJDTjEmMCQGA1UECgwdQkVJSklORyBDRVJUSUZJQ0FURSBBVVRIT1JJ
+VFkxHTAbBgNVBAMMFEJKQ0EgR2xvYmFsIFJvb3QgQ0EyMB4XDTE5MTIxOTAzMTgy
+MVoXDTQ0MTIxMjAzMTgyMVowVDELMAkGA1UEBhMCQ04xJjAkBgNVBAoMHUJFSUpJ
+TkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZMR0wGwYDVQQDDBRCSkNBIEdsb2JhbCBS
+b290IENBMjB2MBAGByqGSM49AgEGBSuBBAAiA2IABJ3LgJGNU2e1uVCxA/jlSR9B
+IgmwUVJY1is0j8USRhTFiy8shP8sbqjV8QnjAyEUxEM9fMEsxEtqSs3ph+B99iK+
++kpRuDCK/eHeGBIK9ke35xe/J4rUQUyWPGCWwf0VHKNCMEAwHQYDVR0OBBYEFNJK
+sVF/BvDRgh9Obl+rg/xI1LCRMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD
+AgEGMAoGCCqGSM49BAMDA2gAMGUCMBq8W9f+qdJUDkpd0m2xQNz0Q9XSSpkZElaA
+94M04TVOSG0ED1cxMDAtsaqdAzjbBgIxAMvMh1PLet8gUXOQwKhbYdDFUDn9hf7B
+43j4ptZLvZuHjw/l1lOWqzzIQNph91Oj9w==
+-----END CERTIFICATE-----

vendor/certifi/cacert.pem

@@ -1,7 +1,7 @@
 __name__ = "ghastoolkit"
 __title__ = "GHAS Toolkit"
 
-__version__ = "0.2.1"
+__version__ = "0.3.1"
 
 __description__ = "GitHub Advanced Security Python Toolkit"
 __summary__ = """\
@@ -40,3 +40,5 @@
 
 # CodeQL
 from ghastoolkit.codeql.databases import CodeQLDatabases, CodeQLDatabase
+from ghastoolkit.codeql.cli import CodeQL
+from ghastoolkit.codeql.results import CodeQLResults

vendor/ghastoolkit/__init__.py

@@ -0,0 +1,104 @@
+import json
+import logging
+import os
+import subprocess
+from sys import stdout
+import tempfile
+from typing import Optional
+
+from ghastoolkit.codeql.databases import CodeQLDatabase
+from ghastoolkit.codeql.results import CodeQLResults
+from ghastoolkit.codeql.utils import findCodeBinary
+
+
+logger = logging.getLogger("ghastoolkit.codeql.cli")
+
+
+class CodeQL:
+    def __init__(self, binary: Optional[str] = None) -> None:
+        if binary:
+            self.path_binary = [binary]
+        else:
+            self.path_binary: Optional[list[str]] = findCodeBinary()
+
+    def exists(self) -> bool:
+        return self.path_binary != None
+
+    def runCommand(self, *argvs, display: bool = False) -> Optional[str]:
+        if not self.path_binary:
+            raise Exception("CodeQL binary / path was not found")
+        cmd = []
+        cmd.extend(self.path_binary)
+        cmd.extend(argvs)
+        if not display:
+            with open(os.devnull, "w") as null:
+                result = subprocess.run(cmd, stdout=null, stderr=null)
+        else:
+            result = subprocess.check_output(cmd)
+            return result.decode().strip()
+
+    @property
+    def version(self) -> str:
+        return self.runCommand("version", "--format", "terse", display=True)
+
+    def runQuery(
+        self, database: CodeQLDatabase, path: Optional[str] = None
+    ) -> CodeQLResults:
+        if not database.path:
+            raise Exception("CodeQL Database path is not set")
+
+        path = path or database.default_pack
+
+        self.runCommand("database", "run-queries", database.path, path)
+        return self.getResults(database, path)
+
+    def runRawQuery(self, path: str, database: CodeQLDatabase) -> list:
+        if not database.path:
+            raise Exception("CodeQL Database path is not set")
+        if not path.endswith(".ql"):
+            raise Exception("runRawQuery requires a QL file")
+
+        self.runCommand("database", "run-queries", database.path, path)
+        bqrs = os.path.join(
+            database.path, "results", path.replace(":", "/").replace(".ql", ".bqrs")
+        )
+        return self.readBqrs(bqrs).get("#select", {}).get("tuples", [])
+
+    def getResults(
+        self, database: CodeQLDatabase, path: Optional[str] = None
+    ) -> CodeQLResults:
+        sarif = os.path.join(tempfile.gettempdir(), "codeql-result.sarif")
+        cmd = [
+            "database",
+            "interpret-results",
+            "--format",
+            "sarif-latest",
+            "--output",
+            sarif,
+            database.path,
+        ]
+        if path:
+            cmd.append(path)
+
+        self.runCommand(*cmd)
+
+        with open(sarif, "r") as handle:
+            data = json.load(handle)
+
+        results = data.get("runs", [])[0].get("results", [])
+        return CodeQLResults.loadSarifResults(results)
+
+    def readBqrs(self, bqrsfile: str) -> dict:
+        output = os.path.join(tempfile.gettempdir(), "codeql-result.bqrs")
+
+        self.runCommand(
+            "bqrs", "decode", "--format", "json", "--output", output, bqrsfile
+        )
+
+        with open(output, "r") as handle:
+            return json.load(handle)
+
+    def __str__(self) -> str:
+        if self.path_binary:
+            return f"CodeQL('{self.version}')"
+        return "CodeQL()"