PyPI - praetorian-cli - Versions diffs - 2.2.11__tar.gz → 2.2.12__tar.gz - Mend

@@ -1,5 +1,5 @@
 from praetorian_cli.sdk.model.globals import Kind
-from praetorian_cli.sdk.model.query import Relationship, Node, Query, risk_of_key, ASSET_NODE, ATTRIBUTE_NODE, Filter
+from praetorian_cli.sdk.model.query import Relationship, Node, Query, risk_of_key, ASSET_NODE, PORT_NODE, Filter, WEBPAGE_NODE
 class Risks:
@@ -132,7 +132,7 @@ class Risks:
         Get all assets affected by a risk.
         This method finds assets that are directly linked to the risk via HAS_VULNERABILITY
-        relationships, as well as assets indirectly linked via attributes that have the risk.
+        relationships, as well as assets indirectly linked via ports that have the risk.
         :param key: The key of the risk to get affected assets for
         :type key: str
@@ -144,11 +144,18 @@ class Risks:
         query = Query(Node(ASSET_NODE, relationships=[to_this]))
         assets, _ = self.api.search.by_query(query)
-        # assets indirectly linked to the risk via an attribute
-        attributes = Node(ATTRIBUTE_NODE, relationships=[to_this])
-        to_attributes = Relationship(Relationship.Label.HAS_ATTRIBUTE, target=attributes)
-        query = Query(Node(ASSET_NODE, relationships=[to_attributes]))
+        # assets indirectly linked to the risk via a port
+        ports = Node(PORT_NODE, relationships=[to_this])
+        to_ports = Relationship(Relationship.Label.HAS_PORT, target=ports)
+        query = Query(Node(ASSET_NODE, relationships=[to_ports]))
         indirect_assets, _ = self.api.search.by_query(query)
+        # webpages linked to the risk
+        webpages = Node(WEBPAGE_NODE, relationships=[to_this])
+        to_webpages = Relationship(Relationship.Label.HAS_WEBPAGE, target=webpages)
+        query = Query(Node(ASSET_NODE, relationships=[to_webpages]))
+        web_assets, _ = self.api.search.by_query(query)
         assets.extend(indirect_assets)
+        assets.extend(web_assets)
         return assets

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: praetorian-cli
-Version: 2.2.11
+Version: 2.2.12
 Summary: For interacting with the Chariot API
 Home-page: https://github.com/praetorian-inc/praetorian-cli
 Author: Praetorian

@@ -126,7 +126,7 @@ class Webpage:
             urlFilter = Filter(field=Filter.Field.KEY, operator=Filter.Operator.CONTAINS, value=filter)
             filters.append(urlFilter)
         node = Node(labels=[Node.Label.WEBPAGE], filters=filters, relationships=relationships)
-        query = Query(node=node, page=offset, limit=pages)
+        query = Query(node=node, page=offset)
         return self.api.search.by_query(query, pages)
     def delete(self, key):

@@ -110,6 +110,7 @@ class Kind(Enum):
     OTHERS = 'others'
     WEBAPPLICATION = 'webapplication'
     WEBPAGE = 'webpage'
+    PORT = 'port'
 EXACT_FLAG = {'exact': 'true'}
 DESCENDING_FLAG = {'desc': 'true'}

@@ -68,6 +68,7 @@ class Relationship:
         DISCOVERED = 'DISCOVERED'
         HAS_ATTRIBUTE = 'HAS_ATTRIBUTE'
         HAS_WEBPAGE = 'HAS_WEBPAGE'
+        HAS_PORT = 'HAS_PORT'
     def __init__(self, label: Label, source: 'Node' = None, target: 'Node' = None, optional: bool = False, length: int = 0):
         self.label = label
@@ -97,6 +98,7 @@ class Node:
         ADDOMAIN = 'ADDomain'
         ATTRIBUTE = 'Attribute'
         RISK = 'Risk'
+        PORT = 'Port'
         PRESEED = 'Preseed'
         SEED = 'Seed'
         TTL = 'TTL'
@@ -152,11 +154,15 @@ class Query:
 ASSET_NODE = [Node.Label.ASSET]
 RISK_NODE = [Node.Label.RISK]
 ATTRIBUTE_NODE = [Node.Label.ATTRIBUTE]
+PORT_NODE = [Node.Label.PORT]
+WEBAPPLICATION_NODE = [Node.Label.WEBAPPLICATION]
+WEBPAGE_NODE = [Node.Label.WEBPAGE]
 KIND_TO_LABEL = {
     Kind.ASSET.value: Node.Label.ASSET,
     Kind.RISK.value: Node.Label.RISK,
     Kind.ATTRIBUTE.value: Node.Label.ATTRIBUTE,
+    Kind.PORT.value: Node.Label.PORT,
     Kind.SEED.value: Node.Label.SEED,
     Kind.PRESEED.value: Node.Label.PRESEED,
     Kind.REPOSITORY.value: Node.Label.REPOSITORY,

@@ -102,7 +102,7 @@ class TestZCli:
         self.verify(f'update risk "{o.risk_key}" -s {Risk.OPEN_LOW.value}')
         self.verify(f'get risk "{o.risk_key}"', [o.risk_key, f'"status": "{Risk.OPEN_LOW.value}"'])
-        self.verify(f'delete risk "{o.risk_key}"')
+        self.verify(f'delete risk "{o.risk_key}" -s {Risk.DELETED_OTHER_LOW.value}')
         self.verify(f'get risk "{o.risk_key}"', [
                     o.risk_key, f'"status": "{Risk.DELETED_OTHER_LOW.value}"',
                     f'"to": "{Risk.DELETED_OTHER_LOW.value}"'])

@@ -1,6 +1,6 @@
 [metadata]
 name = praetorian-cli
-version = 2.2.11
+version = 2.2.12
 author = Praetorian
 author_email = support@praetorian.com
 description = For interacting with the Chariot API

praetorian-cli 2.2.11__tar.gz → 2.2.12__tar.gz

praetorian-cli 2.2.11tar.gz → 2.2.12tar.gz