agilicus 1.289.7__py3-none-any.whl → 1.290.0__py3-none-any.whl

agilicus/agilicus_api/api_client.py

@@ -77,7 +77,7 @@ class ApiClient(object):
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'OpenAPI-Generator/1.289.7/python'
+        self.user_agent = 'OpenAPI-Generator/1.290.0/python'
 
     def __enter__(self):
         return self

agilicus/agilicus_api/configuration.py

@@ -387,7 +387,7 @@ class Configuration(object):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: 2025.05.07\n"\
-               "SDK Package Version: 1.289.7".\
+               "SDK Package Version: 1.290.0".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self):

agilicus/agilicus_api_README.md

@@ -4,7 +4,7 @@ Agilicus is API-first. Modern software is controlled by other software, is open,
 The `agilicus_api` package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
 - API version: 2025.05.07
-- Package version: 1.289.7
+- Package version: 1.290.0
 - Build package: org.openapitools.codegen.languages.PythonClientCodegen
 For more information, please visit [https://www.agilicus.com/api](https://www.agilicus.com/api)
 

agilicus/rules/rules.py

@@ -29,6 +29,7 @@ ConditionTypes = Enum(
         "mfa_rule_condition",
         "scope_condition",
         "network_protocol_condition",
+        "compound_rule_condition",
     ],
 )
 
@@ -928,27 +929,77 @@ def add_network_protocol_condition_rule(
     standalone_rule_policy_id=None,
     **kwargs,
 ):
-    token = context.get_token(ctx)
-    apiclient = context.get_apiclient(ctx, token)
-    kwargs = strip_none(kwargs)
-
     cond = agilicus.NetworkProtocolCondition(
         condition_type=ConditionTypes.network_protocol_condition.name,
         protocol=protocol,
     )
-    extended_cond = agilicus.RuleCondition(condition=cond, negated=False)
+    return add_rule(
+        ctx,
+        name,
+        cond,
+        actions,
+        purpose=purpose,
+        protocol=protocol,
+        standalone_rule_policy_id=standalone_rule_policy_id,
+        **kwargs,
+    )
+
+
+def add_agilicus_default_expose_allow(
+    ctx,
+    label="agilicus-defaults-policy",
+    name="default_expose_network",
+    action="allow",
+    purpose=None,
+    **kwargs,
+):
+    add_network_protocol_condition_rule(
+        ctx,
+        name,
+        [action],
+        protocol="tcp",
+        **kwargs,
+    )
+    add_label(ctx, label=label, **kwargs)
+    add_rule_tree(ctx, name, children=[], rules=[name], **kwargs)
+    add_ruleset(ctx, name, trees=[name], labels=[label], **kwargs)
+
+
+def add_rule(
+    ctx,
+    name,
+    condition,
+    actions,
+    purpose=None,
+    comments=None,
+    roles=None,
+    scope=None,
+    standalone_rule_policy_id=None,
+    **kwargs,
+):
+    token = context.get_token(ctx)
+    apiclient = context.get_apiclient(ctx, token)
+    kwargs = strip_none(kwargs)
+
+    extended_cond = agilicus.RuleCondition(condition=condition, negated=False)
 
     rule = agilicus.RuleConfig(
         name=name,
         extended_condition=extended_cond,
         actions=[agilicus.RuleAction(action=action) for action in actions],
     )
+    if roles is not None:
+        rule.roles = roles
+    if scope is not None:
+        rule.scope = agilicus.RuleScopeEnum(scope)
 
     org_id = get_org_from_input_or_ctx(ctx, **kwargs)
     kwargs["org_id"] = org_id
     spec = agilicus.StandaloneRuleSpec(org_id=org_id, rule=rule)
     if purpose is not None:
         spec.purpose = purpose
+    if comments:
+        spec.comments = comments
 
     if standalone_rule_policy_id is not None:
         spec.standalone_rule_policy_id = standalone_rule_policy_id
@@ -964,24 +1015,47 @@ def add_network_protocol_condition_rule(
     return result
 
 
-def add_agilicus_default_expose_allow(
+def make_compound_condition(
+    conditions,
+    list_type="cnf",
+):
+    return agilicus.CompoundRuleCondition(
+        condition_type=ConditionTypes.compound_rule_condition.name,
+        condition_list=conditions,
+        list_type=list_type,
+    )
+
+
+def add_agilicus_default_database_allow(
     ctx,
     label="agilicus-defaults-policy",
-    name="default_expose_network",
+    name="default_database",
     action="allow",
-    purpose=None,
     **kwargs,
 ):
-    add_network_protocol_condition_rule(
+    # The database rule uses an empty cnf compound condition to match everything,
+    # subject to the scope and roles
+    condition = make_compound_condition([], list_type="cnf")
+    add_rule(
         ctx,
         name,
-        [action],
-        protocol="tcp",
+        condition=condition,
+        actions=[action],
+        roles=["owner"],
+        scope="assigned_to_user",
         **kwargs,
     )
     add_label(ctx, label=label, **kwargs)
     add_rule_tree(ctx, name, children=[], rules=[name], **kwargs)
-    add_ruleset(ctx, name, trees=[name], labels=[label], **kwargs)
+    # The scope here ensures this entire set of rules only applies to databases
+    add_ruleset(
+        ctx,
+        name,
+        trees=[name],
+        labels=[label],
+        scopes=["urn:agilicus:database:*"],
+        **kwargs,
+    )
 
 
 def add_agilicus_default_policy(
@@ -989,3 +1063,4 @@ def add_agilicus_default_policy(
     **kwargs,
 ):
     add_agilicus_default_expose_allow(ctx)
+    add_agilicus_default_database_allow(ctx)

agilicus/rules/rules_main.py

@@ -388,6 +388,13 @@ def cli_command_add_agilicus_default_expose_allow(ctx, **kwargs):
     rules.add_agilicus_default_expose_allow(ctx, **kwargs)
 
 
+@click.command(name="add-agilicus-default-policy")
+@click.option("--org-id", default=None)
+@click.pass_context
+def cli_command_add_agilicus_default_policy(ctx, **kwargs):
+    rules.add_agilicus_default_policy(ctx, **kwargs)
+
+
 @click.command(name="add-scope-condition-rule")
 @click.option("--name", required=True)
 @click.option("--action", required=True, multiple=True, type=click.Choice(rules.ACTIONS))

{agilicus-1.289.7.dist-info → agilicus-1.290.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: agilicus
-Version: 1.289.7
+Version: 1.290.0
 Summary: Agilicus SDK
 Home-page: https://www.agilicus.com/
 License: MIT

{agilicus-1.289.7.dist-info → agilicus-1.290.0.dist-info}/RECORD

@@ -71,9 +71,9 @@ agilicus/agilicus_api/api/users_api.py,sha256=JzmgKStE-ZWvm4KR2Q7Vaa_UTj40LoWrnY
 agilicus/agilicus_api/api/users_api_mock.py,sha256=aMSUc12JQAo1O9rp2YnyQldANFGlfi57fMnQyCIrJuE,17209
 agilicus/agilicus_api/api/whoami_api.py,sha256=8gizWCB2aF8XWhwbR5z4DVF0QBcqyGEy0Pera9kArAo,7941
 agilicus/agilicus_api/api/whoami_api_mock.py,sha256=rlvZoWnMCqORMZBg7SOv6d3xp52kELdh6wXcCaIZ93w,346
-agilicus/agilicus_api/api_client.py,sha256=mrUmgkIZA9_3Bnol-hcnvIeZPOkS3a2WG3DCjS2NU0c,38845
+agilicus/agilicus_api/api_client.py,sha256=qNXZWzqzS0_zzowlXKPFANfAgkQHAHVUw6gU0SY6ITQ,38845
 agilicus/agilicus_api/apis/__init__.py,sha256=aJZD7x-umdSni6ZBr4XxzpH8pwtU9hA5LlCDxcqa1Q8,2224
-agilicus/agilicus_api/configuration.py,sha256=N2u-BpTRcj6D1rB_HpahXBkIK31nGhgeXirhb08A1nU,18447
+agilicus/agilicus_api/configuration.py,sha256=LMKuraou4lcmt_fUFYHUXkd9_G2zOFWjN1OD8x0zlpY,18447
 agilicus/agilicus_api/docs/APIKey.md,sha256=4cKuz4_l9HcEDnUrLwYbEnn9C2WoDayrjfrY1Ixgaf4,1747
 agilicus/agilicus_api/docs/APIKeyIntrospect.md,sha256=nJ-zkuFm3JMbWFDYYN_vYyQk1snGBtBvIxtCQxamhAU,1019
 agilicus/agilicus_api/docs/APIKeyIntrospectAuthorizationInfo.md,sha256=7RApOOLjvWQs5sw2jb25g7i3Kta1BiEY-s8VRXfppH8,725
@@ -2703,7 +2703,7 @@ agilicus/agilicus_api/test/test_x509_root_certificate.py,sha256=AJLLjTwkZtUXFa1H
 agilicus/agilicus_api/test/test_x509_root_certificate_spec.py,sha256=qLPux35AzYJaHTQVQjMxhaP-Razu5aH4nC_fcQo7K6U,2832
 agilicus/agilicus_api/test/test_x509_root_certificate_status.py,sha256=zoA2F3LoHJ6mJ64_Xg_ekZwzW0fCb1-33A_5u9YVdFo,2846
 agilicus/agilicus_api/test/test_xss_settings.py,sha256=JRiq6WszL24ZNAAqGvT1FTV60D2rbQt_oe4F8pnue3k,2746
-agilicus/agilicus_api_README.md,sha256=Nys2-cdl-DmsQe7rFSgnF81T_I-VxY4M_neaW9I6Ul8,173709
+agilicus/agilicus_api_README.md,sha256=35fMIodPAPTaU_BKEOnIZac7_obKkW-HMXQXXDXCbDA,173709
 agilicus/aliases.ini,sha256=MxqiVo2f2xdUDVF1YDkNW36AIqN8hrYjlTVfraEUZXY,455
 agilicus/amq.py,sha256=yxi-YTbJPVl10s78Hlr1dmrQR63iaSIoROGVILzFPmE,1775
 agilicus/apps.py,sha256=Mdc_pRXyfa-IvIFH7gNbx0Ob64gUHggZyeSyLUDpjMs,54048
@@ -2790,8 +2790,8 @@ agilicus/regions.py,sha256=P2VqBXtNQ0G2uY69niIuLcVTynugyZgox_EaNEGuGUs,13067
 agilicus/resource_helpers.py,sha256=rATvmW5AN6rt_BIKtJnENyU9QEwujyWaIZV2ou6PPck,1271
 agilicus/resources.py,sha256=PnJwLMSWVQgxSAzjreY-zcyNB2aWM7gtlqUSgrYvb3Y,10605
 agilicus/response.py,sha256=tI2-dAJwhBuuDplSsouuMmCmKHSwR_Mx71af8tgsuYo,468
-agilicus/rules/rules.py,sha256=ALaWcePTAqFXqB9zuXapG4QV0jjZdvDX3a4hYlstL0M,29201
-agilicus/rules/rules_main.py,sha256=3mawQd0C8py7r7MSjXymapskaLw-O-VG1G-Zy3U1i2I,14800
+agilicus/rules/rules.py,sha256=gpu7g308fTlE0LVuBcUXikho6TBx4-kdPUM6mPmawdY,30980
+agilicus/rules/rules_main.py,sha256=aOH4mcxb4-_azgzcz5kuOSzI-CvLhCwq1rZxDvaoHe4,15026
 agilicus/scopes.py,sha256=OgPUksJSOSaJ3XcHPP8WJQ3e_p8B9wVmRXr-oZDfZP0,1344
 agilicus/service_configuration.py,sha256=WlsvTKA_bkle1PthJK0S96lpPK7GNr-BWWp8a_-MgtM,490
 agilicus/service_token.py,sha256=YDVFeBe9Yv0qYvfUenwnpGHuj2x1J06YUe5A_C8L6L4,7162
@@ -2806,8 +2806,8 @@ agilicus/trusted_certs/trusted_certs_main.py,sha256=6dHHWXvNIcUa_nA9ptigL4Vibe4n
 agilicus/users.py,sha256=bUFtVlTjUeEoQlzsQcfS8ChN0X9mbHs8v0xbkK-cldQ,41772
 agilicus/version.py,sha256=G9OFdL1v_4dLDfk6I6taDNypM5bbO-JHAwilsu9LYgg,23
 agilicus/whoami.py,sha256=kqghtWMgZOd2rhKmfguDwCTm6A3gNS8Kj-S2IBxBtl0,206
-agilicus-1.289.7.dist-info/LICENSE.txt,sha256=Zq4tqiCroC2CVrBB_PWjapRdvpae23nljdiaSkOzUho,1061
-agilicus-1.289.7.dist-info/METADATA,sha256=PoRXdzPz_f_eLV9sBK5HuzfsmClK2WKIVHUSXSPZ0Ww,3878
-agilicus-1.289.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-agilicus-1.289.7.dist-info/entry_points.txt,sha256=a66hGozzLkHu0IewFzIMbSAhMTNTddUaA2T3_16Gb_s,51
-agilicus-1.289.7.dist-info/RECORD,,
+agilicus-1.290.0.dist-info/LICENSE.txt,sha256=Zq4tqiCroC2CVrBB_PWjapRdvpae23nljdiaSkOzUho,1061
+agilicus-1.290.0.dist-info/METADATA,sha256=Hi0x24_PpBpLZwsA35XKrPYmrt3XzXVW2GxzL6qdQQ4,3878
+agilicus-1.290.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+agilicus-1.290.0.dist-info/entry_points.txt,sha256=a66hGozzLkHu0IewFzIMbSAhMTNTddUaA2T3_16Gb_s,51
+agilicus-1.290.0.dist-info/RECORD,,