Merge pull request #222 from Axonius/develop

backmerge 4.50.3
Axonius · Feb 22, 2023 · 2836b51 · 2836b51
2 parents 41c9b1d + 2cefc50
commit 2836b51
Show file tree

Hide file tree

Showing 19 changed files with 161 additions and 129 deletions.
diff --git a/axonius_api_client/api/adapters/cnx.py b/axonius_api_client/api/adapters/cnx.py
@@ -479,7 +479,7 @@ def add(
             tunnel=tunnel_id,
         )
 
-        if not result.working or not cnx_new["working"]:
+        if not result.working and not cnx_new["working"]:
             err = f"Connection was added but had a failure connecting:\n{result}"
             exc = CnxAddError(err)
             exc.result = result
@@ -673,7 +673,7 @@ def update_cnx(
             tunnel=tunnel_id_new,
         )
 
-        if not result.working or not cnx_new["working"]:
+        if not result.working and not cnx_new["working"]:
             err = f"Connection configuration was updated but had a failure connecting:\n{result}"
             exc = CnxUpdateError(err)
             exc.result = result

diff --git a/axonius_api_client/api/json_api/adapters.py b/axonius_api_client/api/json_api/adapters.py
@@ -1287,6 +1287,7 @@ class AdapterNodeCnx(BaseModel):
     error: t.Optional[str] = ""
     tunnel_id: t.Optional[str] = None
     did_notify_error: t.Optional[bool] = None
+    note: t.Optional[t.Any] = None
     document_meta: t.Optional[dict] = dataclasses.field(default_factory=dict)
 
     def __post_init__(self):
@@ -1761,6 +1762,7 @@ class Cnx(BaseModel):
     failed_connections_limit_exceeded: t.Optional[int] = None
     adapter_name_raw: t.ClassVar[str] = None
     connection_label: t.ClassVar[str] = None
+    note: t.Optional[t.Any] = None
     PARENT: t.ClassVar["Cnxs"] = None
     HTTP: t.ClassVar[Http] = None
     document_meta: t.Optional[dict] = dataclasses.field(default_factory=dict)

diff --git a/axonius_api_client/api/json_api/base.py b/axonius_api_client/api/json_api/base.py
@@ -560,9 +560,6 @@ def extra_attributes(self, value: dict):
                 ]
                 msg = "\n".join(msgs)
                 LOGGER.warning(msg)
-                # import pdb
-
-                # pdb.set_trace(header=msg)
                 if get_env_extra_warn():
                     warnings.warn(message=msg, category=ExtraAttributeWarning)
 

diff --git a/axonius_api_client/api/json_api/enforcements.py b/axonius_api_client/api/json_api/enforcements.py
@@ -270,6 +270,10 @@ class SetBasicSchema(BaseSchemaJson):
     action_names = marshmallow_jsonapi.fields.List(marshmallow_jsonapi.fields.Str())
     history = marshmallow.fields.Dict(allow_none=True, load_default={}, dump_default={})
     last_run_status = marshmallow_jsonapi.fields.Str(allow_none=True)
+    folder_id = marshmallow_jsonapi.fields.Str(
+        load_default=None, dump_default=None, allow_none=True
+    )
+    next_run = SchemaDatetime(allow_none=True)
 
     class Meta:
         """Pass."""
@@ -315,6 +319,10 @@ class SetBasic(BaseModel):
     document_meta: t.Optional[dict] = dataclasses.field(default_factory=dict)
     history: t.Optional[dict] = dataclasses.field(default_factory=dict)
     last_run_status: t.Optional[str] = None
+    folder_id: t.Optional[str] = None
+    next_run: t.Optional[datetime.datetime] = get_field_dc_mm(
+        mm_field=SchemaDatetime(allow_none=True, load_default=None, dump_default=None), default=None
+    )
     document_meta: t.Optional[dict] = dataclasses.field(default_factory=dict)
 
     @property
@@ -440,6 +448,9 @@ class SetFullSchema(BaseSchemaJson):
     triggers = marshmallow_jsonapi.fields.List(marshmallow_jsonapi.fields.Dict())
     description = marshmallow_jsonapi.fields.Str()
     settings = marshmallow_jsonapi.fields.Dict(load_default={}, dump_default={})
+    folder_id = marshmallow_jsonapi.fields.Str(
+        load_default=None, dump_default=None, allow_none=True
+    )
 
     class Meta:
         """Pass."""
@@ -463,6 +474,7 @@ class SetFull(BaseModel):
     triggers: t.List[dict]
     description: t.Optional[str] = ""
     settings: t.Optional[dict] = dataclasses.field(default_factory=dict)
+    folder_id: t.Optional[str] = None
     document_meta: t.Optional[dict] = dataclasses.field(default_factory=dict)
 
     BASIC: t.ClassVar[SetBasic] = None
@@ -1022,6 +1034,9 @@ class UpdateResponseSchema(BaseSchemaJson):
     last_updated = SchemaDatetime(allow_none=True)
     description = marshmallow_jsonapi.fields.Str()
     settings = marshmallow_jsonapi.fields.Dict(load_default={}, dump_default={})
+    folder_id = marshmallow_jsonapi.fields.Str(
+        load_default=None, dump_default=None, allow_none=True
+    )
 
     class Meta:
         """Pass."""
@@ -1047,6 +1062,7 @@ class UpdateResponse(BaseModel):
         mm_field=SchemaDatetime(allow_none=True, load_default=None, dump_default=None), default=None
     )
     description: t.Optional[str] = ""
+    folder_id: t.Optional[str] = None
     settings: t.Optional[dict] = dataclasses.field(default_factory=dict)
     document_meta: t.Optional[dict] = dataclasses.field(default_factory=dict)
 

diff --git a/axonius_api_client/api/json_api/saved_queries.py b/axonius_api_client/api/json_api/saved_queries.py
@@ -139,7 +139,8 @@ class SavedQuerySchema(BaseSchemaJson):
     description = marshmallow_jsonapi.fields.Str(load_default="", dump_default="", allow_none=True)
     view = marshmallow_jsonapi.fields.Dict(allow_none=True, load_default={}, dump_default={})
     tags = marshmallow_jsonapi.fields.List(marshmallow_jsonapi.fields.Str())
-    predefined = SchemaBool(load_default=False, dump_default=False)
+    # PBUG: An null predefined can still come back from the server.
+    predefined = SchemaBool(allow_none=True, load_default=False, dump_default=False)
     date_fetched = marshmallow_jsonapi.fields.Str(
         allow_none=True, load_default=None, dump_default=None
     )
@@ -393,7 +394,7 @@ class SavedQuery(BaseModel, SavedQueryMixins):
     private: bool = dataclasses.field(default=False, metadata={"update": True})
     description: t.Optional[str] = dataclasses.field(default="", metadata={"update": True})
     tags: t.List[str] = dataclasses.field(default_factory=list, metadata={"update": True})
-    predefined: bool = dataclasses.field(default=False, metadata={"update": False})
+    predefined: t.Optional[bool] = dataclasses.field(default=False, metadata={"update": False})
     is_asset_scope_query_ready: bool = dataclasses.field(default=False, metadata={"update": False})
     is_referenced: bool = dataclasses.field(default=False, metadata={"update": False})
     folder_id: str = dataclasses.field(default="", metadata={"update": True})

diff --git a/axonius_api_client/cert_human/all_logs_list.json b/axonius_api_client/cert_human/all_logs_list.json
@@ -1,7 +1,7 @@
 {
     "is_all_logs": true,
-    "version": "17.41",
-    "log_list_timestamp": "2023-01-11T12:56:07Z",
+    "version": "19.10",
+    "log_list_timestamp": "2023-02-13T12:56:28Z",
     "operators": [
         {
             "name": "Google",
@@ -48,8 +48,8 @@
                     "url": "https://ct.googleapis.com/logs/argon2022/",
                     "mmd": 86400,
                     "state": {
-                        "usable": {
-                            "timestamp": "2019-12-17T18:38:01Z"
+                        "rejected": {
+                            "timestamp": "2023-02-01T00:00:00Z"
                         }
                     },
                     "temporal_interval": {
@@ -128,8 +128,8 @@
                     "url": "https://ct.googleapis.com/logs/xenon2022/",
                     "mmd": 86400,
                     "state": {
-                        "usable": {
-                            "timestamp": "2019-06-17T21:23:01Z"
+                        "rejected": {
+                            "timestamp": "2023-02-01T00:00:00Z"
                         }
                     },
                     "temporal_interval": {
@@ -475,8 +475,8 @@
                     "url": "https://ct.cloudflare.com/logs/nimbus2022/",
                     "mmd": 86400,
                     "state": {
-                        "usable": {
-                            "timestamp": "2019-10-31T19:22:00Z"
+                        "rejected": {
+                            "timestamp": "2023-02-01T00:00:00Z"
                         }
                     },
                     "temporal_interval": {
@@ -591,8 +591,8 @@
                     "url": "https://ct2.digicert-ct.com/log/",
                     "mmd": 86400,
                     "state": {
-                        "retired": {
-                            "timestamp": "2020-05-04T00:00:40Z"
+                        "rejected": {
+                            "timestamp": "2023-02-01T00:00:00Z"
                         }
                     }
                 },
@@ -635,8 +635,8 @@
                     "url": "https://yeti2022.ct.digicert.com/log/",
                     "mmd": 86400,
                     "state": {
-                        "retired": {
-                            "timestamp": "2021-07-21T00:00:00Z"
+                        "rejected": {
+                            "timestamp": "2023-02-01T00:00:00Z"
                         }
                     },
                     "temporal_interval": {
@@ -731,8 +731,8 @@
                     "url": "https://nessie2022.ct.digicert.com/log/",
                     "mmd": 86400,
                     "state": {
-                        "usable": {
-                            "timestamp": "2019-05-09T22:11:02Z"
+                        "rejected": {
+                            "timestamp": "2023-02-01T00:00:00Z"
                         }
                     },
                     "temporal_interval": {
@@ -831,8 +831,8 @@
                     "url": "https://yeti2022-2.ct.digicert.com/log/",
                     "mmd": 86400,
                     "state": {
-                        "retired": {
-                            "timestamp": "2022-09-29T00:00:00Z"
+                        "rejected": {
+                            "timestamp": "2023-02-01T00:00:00Z"
                         }
                     },
                     "temporal_interval": {
@@ -1106,8 +1106,8 @@
                     "url": "https://mammoth.ct.comodo.com/",
                     "mmd": 86400,
                     "state": {
-                        "usable": {
-                            "timestamp": "2017-10-10T00:38:10Z"
+                        "retired": {
+                            "timestamp": "2023-01-15T00:00:00Z"
                         }
                     }
                 },
@@ -1165,8 +1165,8 @@
                     "url": "https://oak.ct.letsencrypt.org/2022/",
                     "mmd": 86400,
                     "state": {
-                        "usable": {
-                            "timestamp": "2020-01-27T18:18:26Z"
+                        "rejected": {
+                            "timestamp": "2023-02-01T00:00:00Z"
                         }
                     },
                     "temporal_interval": {
@@ -1392,8 +1392,8 @@
                     "url": "https://ct.trustasia.com/log2022/",
                     "mmd": 86400,
                     "state": {
-                        "usable": {
-                            "timestamp": "2021-03-01T19:24:00Z"
+                        "rejected": {
+                            "timestamp": "2023-02-01T00:00:00Z"
                         }
                     },
                     "temporal_interval": {
@@ -1440,8 +1440,8 @@
                     "url": "https://ct2024.trustasia.com/log2024/",
                     "mmd": 86400,
                     "state": {
-                        "qualified": {
-                            "timestamp": "2022-11-22T00:00:00Z"
+                        "usable": {
+                            "timestamp": "2023-02-03T08:00:00Z"
                         }
                     },
                     "temporal_interval": {

diff --git a/axonius_api_client/cert_human/constants.py b/axonius_api_client/cert_human/constants.py
@@ -11,7 +11,7 @@ class CT_LOGS:
     modified_days_max: Optional[int] = 30
     timeout: Tuple[float, float] = (3.2, 6.2)
 
-    url: str = "https://www.gstatic.com/ct/log_list/v2/all_logs_list.json"
+    url: str = "https://www.gstatic.com/ct/log_list/v3/all_logs_list.json"
     data_file: str = "all_logs_list.json"
     path: pathlib.Path = pathlib.Path(__file__).parent / data_file
     request_args: dict = {}

diff --git a/axonius_api_client/cli/grp_enforcements/grp_common.py b/axonius_api_client/cli/grp_enforcements/grp_common.py
@@ -294,7 +294,28 @@
         show_envvar=True,
         show_default=True,
     ),
-    *OPTS_SCHEDULE_TIME,
+    click.option(
+        "--schedule-hour",
+        "-sh",
+        "schedule_hour",
+        help="Hour to use for schedule",
+        default=SetDefaults.schedule_hour,
+        type=click.INT,
+        required=False,
+        show_envvar=True,
+        show_default=True,
+    ),
+    click.option(
+        "--schedule-minute",
+        "-sm",
+        "schedule_minute",
+        help="Minute to use for schedule",
+        default=SetDefaults.schedule_minute,
+        type=click.INT,
+        required=False,
+        show_envvar=True,
+        show_default=True,
+    ),
     click.option(
         "--schedule-recurrence",
         "-sr",

diff --git a/axonius_api_client/cli/grp_tools/cmd_signup.py b/axonius_api_client/cli/grp_tools/cmd_signup.py
@@ -90,4 +90,5 @@ def cmd(ctx, url, password, company_name, contact_email, export_format):
         data["url"] = url
 
     click.secho(EXPORT_FORMATS[export_format](data=data))
+    ctx.obj.echo_ok("Signup completed successfully!")
     ctx.exit(0)
diff --git a/axonius_api_client/constants/wizards.py b/axonius_api_client/constants/wizards.py
@@ -268,7 +268,7 @@ class Docs:
   }}
 ]
 """
-    EX_FIELDS: str = "os.distribution,os.os_str,aws:aws_device_type"
+    EX_FIELDS: str = "os.distribution,os.os_str,active_directory:ad_password_last_set"
     GUI_PAGE_SIZES_STR = " or ".join([str(x) for x in GUI_PAGE_SIZES]) + " (default 20 if empty)"
     OPT_BOOL = "Optional: True or False (default False if empty)"
     EX_CSV: str = f"""