diff --git a/bin/plugin/admin/adminMaintenance.json b/bin/plugin/admin/adminMaintenance.json index 5b4595059..dba2ef748 100644 --- a/bin/plugin/admin/adminMaintenance.json +++ b/bin/plugin/admin/adminMaintenance.json @@ -1,9 +1,9 @@ { "interactive": [ - "adminMaintenance" , { "ac" : ["--lock","--unlock"]}, - "adminMaintenance --lock" , { "ac" : ["--message",""]}, - "adminMaintenance --lock --message" , { "pr" : ["\"\""]}, - "adminMaintenance --lock --message .+" , { "pr" : [""]}, - "adminMaintenance --unlock" , { "pr" : [""]} + "adminMaintenance" , { "ac" : ["--lock","--unlock"]}, + "adminMaintenance +--lock" , { "ac" : ["--message",""]}, + "adminMaintenance +--lock +--message" , { "pr" : ["\"\""]}, + "adminMaintenance +--lock +--message +.+" , { "pr" : [""]}, + "adminMaintenance +--unlock" , { "pr" : [""]} ] } diff --git a/bin/plugin/admin/adminSudo.json b/bin/plugin/admin/adminSudo.json index 5499caa92..416a9721d 100644 --- a/bin/plugin/admin/adminSudo.json +++ b/bin/plugin/admin/adminSudo.json @@ -1,10 +1,10 @@ { "interactive": [ - "adminSudo" , { "ac" : ["-- --sudo-as"]}, - "adminSudo -- --sudo-as" , { "ac" : ["" ]}, - "adminSudo -- --sudo-as \\S+" , { "ac" : ["--sudo-cmd" ]}, - "adminSudo -- --sudo-as \\S+ --sudo-cmd" , { "ac" : ["" ]}, - "adminSudo -- --sudo-as \\S+ --sudo-cmd \\S+" , { "ac" : ["--" ]}, - "adminSudo -- --sudo-as \\S+ --sudo-cmd \\S+ --" , { "pr" : [" or additional COMMAND-specific options" ]} + "adminSudo" , { "ac" : ["-- --sudo-as"]}, + "adminSudo +-- +--sudo-as" , { "ac" : ["" ]}, + "adminSudo +-- +--sudo-as +\\S+" , { "ac" : ["--sudo-cmd" ]}, + "adminSudo +-- +--sudo-as +\\S+ +--sudo-cmd" , { "ac" : ["" ]}, + "adminSudo +-- +--sudo-as +\\S+ +--sudo-cmd +\\S+" , { "ac" : ["--" ]}, + "adminSudo +-- +--sudo-as +\\S+ +--sudo-cmd +\\S+ +--" , { "pr" : [" or additional COMMAND-specific options" ]} ] } diff --git a/bin/plugin/group-aclkeeper/groupAddServer.json b/bin/plugin/group-aclkeeper/groupAddServer.json index 02c8327e7..c52cfc5c0 100644 --- a/bin/plugin/group-aclkeeper/groupAddServer.json +++ b/bin/plugin/group-aclkeeper/groupAddServer.json @@ -1,17 +1,17 @@ { "interactive": [ - "groupAddServer" , {"ac" : ["--group"]}, - "groupAddServer --group" , {"ac" : [""]}, - "groupAddServer --group \\S+" , {"ac" : ["--host"]}, - "groupAddServer --group \\S+ --host" , {"pr" : ["", "", ""]}, - "groupAddServer --group \\S+ --host \\S+" , {"ac" : ["--port", "--port-any"]}, - "groupAddServer --group \\S+ --host \\S+ --port" , {"pr" : [""]}, - "groupAddServer --group \\S+ --host \\S+ --port(-any| \\d+)" , {"ac" : ["--user", "--user-any"]}, - "groupAddServer --group \\S+ --host \\S+ --port(-any| \\d+) --user" , {"pr" : [""]}, - "groupAddServer --group \\S+ --host \\S+ --port(-any| \\d+) --user(-any| \\S+)" , {"ac" : ["", "--force-password", "--force"]}, - "groupAddServer --group \\S+ --host \\S+ --port(-any| \\d+) --user(-any| \\S+) --force-password" , {"pr" : [""]}, - "groupAddServer --group \\S+ --host \\S+ --port(-any| \\d+) --user(-any| \\S+) --force-password \\S+" , {"ac" : ["", "--force"]}, - "groupAddServer --group \\S+ --host \\S+ --port(-any| \\d+) --user(-any| \\S+) --force-password \\S+ --force" , {"pr" : [""]} + "groupAddServer" , {"ac" : ["--group"]}, + "groupAddServer +--group" , {"ac" : [""]}, + "groupAddServer +--group +\\S+" , {"ac" : ["--host"]}, + "groupAddServer +--group +\\S+ +--host" , {"pr" : ["", "", ""]}, + "groupAddServer +--group +\\S+ +--host +\\S+" , {"ac" : ["--port", "--port-any"]}, + "groupAddServer +--group +\\S+ +--host +\\S+ +--port" , {"pr" : [""]}, + "groupAddServer +--group +\\S+ +--host +\\S+ +--port(-any| +\\d+)" , {"ac" : ["--user", "--user-any"]}, + "groupAddServer +--group +\\S+ +--host +\\S+ +--port(-any| +\\d+) +--user" , {"pr" : [""]}, + "groupAddServer +--group +\\S+ +--host +\\S+ +--port(-any| +\\d+) +--user(-any| +\\S+)" , {"ac" : ["", "--force-password", "--force"]}, + "groupAddServer +--group +\\S+ +--host +\\S+ +--port(-any| +\\d+) +--user(-any| +\\S+) +--force-password" , {"pr" : [""]}, + "groupAddServer +--group +\\S+ +--host +\\S+ +--port(-any| +\\d+) +--user(-any| +\\S+) +--force-password +\\S+" , {"ac" : ["", "--force"]}, + "groupAddServer +--group +\\S+ +--host +\\S+ +--port(-any| +\\d+) +--user(-any| +\\S+) +--force-password +\\S+ +--force" , {"pr" : [""]} ], "master_only": true } diff --git a/bin/plugin/group-aclkeeper/groupDelServer.json b/bin/plugin/group-aclkeeper/groupDelServer.json index 9391fdeb1..94fe0a6ce 100644 --- a/bin/plugin/group-aclkeeper/groupDelServer.json +++ b/bin/plugin/group-aclkeeper/groupDelServer.json @@ -1,14 +1,14 @@ { "interactive": [ - "groupDelServer" , {"ac" : ["--group"]}, - "groupDelServer --group" , {"ac" : [""]}, - "groupDelServer --group \\S+" , {"ac" : ["--host"]}, - "groupDelServer --group \\S+ --host" , {"pr" : ["", "", ""]}, - "groupDelServer --group \\S+ --host \\S+" , {"ac" : ["--port", "--port-any"]}, - "groupDelServer --group \\S+ --host \\S+ --port" , {"pr" : [""]}, - "groupDelServer --group \\S+ --host \\S+ --port(-any| \\d+)" , {"ac" : ["--user", "--user-any"]}, - "groupDelServer --group \\S+ --host \\S+ --port(-any| \\d+) --user" , {"pr" : [""]}, - "groupDelServer --group \\S+ --host \\S+ --port(-any| \\d+) --user(-any| \\S+)" , {"pr" : ["", "--force"]} + "groupDelServer" , {"ac" : ["--group"]}, + "groupDelServer +--group" , {"ac" : [""]}, + "groupDelServer +--group +\\S+" , {"ac" : ["--host"]}, + "groupDelServer +--group +\\S+ +--host" , {"pr" : ["", "", ""]}, + "groupDelServer +--group +\\S+ +--host +\\S+" , {"ac" : ["--port", "--port-any"]}, + "groupDelServer +--group +\\S+ +--host +\\S+ +--port" , {"pr" : [""]}, + "groupDelServer +--group +\\S+ +--host +\\S+ +--port(-any| +\\d+)" , {"ac" : ["--user", "--user-any"]}, + "groupDelServer +--group +\\S+ +--host +\\S+ +--port(-any| +\\d+) +--user" , {"pr" : [""]}, + "groupDelServer +--group +\\S+ +--host +\\S+ +--port(-any| +\\d+) +--user(-any| +\\S+)" , {"pr" : ["", "--force"]} ], "master_only": true } diff --git a/bin/plugin/group-gatekeeper/groupAddGuestAccess.json b/bin/plugin/group-gatekeeper/groupAddGuestAccess.json index 6222ec572..2a9654cd2 100644 --- a/bin/plugin/group-gatekeeper/groupAddGuestAccess.json +++ b/bin/plugin/group-gatekeeper/groupAddGuestAccess.json @@ -1,17 +1,17 @@ { "interactive": [ - "groupAddGuestAccess" , {"ac" : ["--account"]}, - "groupAddGuestAccess --account" , {"ac" : [""]}, - "groupAddGuestAccess --account \\S+" , {"ac" : ["--group"]}, - "groupAddGuestAccess --account \\S+ --group" , {"ac" : [""]}, - "groupAddGuestAccess --account \\S+ --group \\S+" , {"ac" : ["--host"]}, - "groupAddGuestAccess --account \\S+ --group \\S+ --host" , {"pr" : ["", "", ""]}, - "groupAddGuestAccess --account \\S+ --group \\S+ --host \\S+" , {"ac" : ["", "--user", "--port"]}, - "groupAddGuestAccess --account \\S+ --group \\S+ --host \\S+ .*--user" , {"pr" : [""]}, - "groupAddGuestAccess --account \\S+ --group \\S+ --host \\S+ .*--port" , {"pr" : [""]}, - "groupAddGuestAccess --account \\S+ --group \\S+ --host \\S+ --user \\S+" , {"ac" : ["", "--port"]}, - "groupAddGuestAccess --account \\S+ --group \\S+ --host \\S+ --port \\S+" , {"ac" : ["", "--user"]}, - "groupAddGuestAccess --account \\S+ --group \\S+ --host \\S+ --(port|user) \\S+ --(port|user) \\S+" , {"pr" : [""]} + "groupAddGuestAccess" , {"ac" : ["--account"]}, + "groupAddGuestAccess +--account" , {"ac" : [""]}, + "groupAddGuestAccess +--account +\\S+" , {"ac" : ["--group"]}, + "groupAddGuestAccess +--account +\\S+ +--group" , {"ac" : [""]}, + "groupAddGuestAccess +--account +\\S+ +--group +\\S+" , {"ac" : ["--host"]}, + "groupAddGuestAccess +--account +\\S+ +--group +\\S+ +--host" , {"pr" : ["", "", ""]}, + "groupAddGuestAccess +--account +\\S+ +--group +\\S+ +--host +\\S+" , {"ac" : ["", "--user", "--port"]}, + "groupAddGuestAccess +--account +\\S+ +--group +\\S+ +--host +\\S+ +.*--user" , {"pr" : [""]}, + "groupAddGuestAccess +--account +\\S+ +--group +\\S+ +--host +\\S+ +.*--port" , {"pr" : [""]}, + "groupAddGuestAccess +--account +\\S+ +--group +\\S+ +--host +\\S+ +--user +\\S+" , {"ac" : ["", "--port"]}, + "groupAddGuestAccess +--account +\\S+ +--group +\\S+ +--host +\\S+ +--port +\\S+" , {"ac" : ["", "--user"]}, + "groupAddGuestAccess +--account +\\S+ +--group +\\S+ +--host +\\S+ +--(port|user) +\\S+ +--(port|user) +\\S+" , {"pr" : [""]} ], "master_only": true } diff --git a/bin/plugin/group-gatekeeper/groupAddMember.json b/bin/plugin/group-gatekeeper/groupAddMember.json index b2514172c..4250b67e5 100644 --- a/bin/plugin/group-gatekeeper/groupAddMember.json +++ b/bin/plugin/group-gatekeeper/groupAddMember.json @@ -1,10 +1,10 @@ { "interactive": [ - "groupAddMember" , {"ac" : ["--account"]}, - "groupAddMember --account" , {"ac" : [""]}, - "groupAddMember --account \\S+" , {"ac" : ["--group"]}, - "groupAddMember --account \\S+ --group" , {"ac" : [""]}, - "groupAddMember --account \\S+ --group \\S+" , {"pr" : [""]} + "groupAddMember" , {"ac" : ["--account"]}, + "groupAddMember +--account" , {"ac" : [""]}, + "groupAddMember +--account +\\S+" , {"ac" : ["--group"]}, + "groupAddMember +--account +\\S+ +--group" , {"ac" : [""]}, + "groupAddMember +--account +\\S+ +--group +\\S+" , {"pr" : [""]} ], "master_only": true } diff --git a/bin/plugin/group-gatekeeper/groupDelGuestAccess.json b/bin/plugin/group-gatekeeper/groupDelGuestAccess.json index 160503ca9..024cc6b9d 100644 --- a/bin/plugin/group-gatekeeper/groupDelGuestAccess.json +++ b/bin/plugin/group-gatekeeper/groupDelGuestAccess.json @@ -1,17 +1,17 @@ { "interactive": [ - "groupDelGuestAccess" , {"ac" : ["--account"]}, - "groupDelGuestAccess --account" , {"ac" : [""]}, - "groupDelGuestAccess --account \\S+" , {"ac" : ["--group"]}, - "groupDelGuestAccess --account \\S+ --group" , {"ac" : [""]}, - "groupDelGuestAccess --account \\S+ --group \\S+" , {"ac" : ["--host"]}, - "groupDelGuestAccess --account \\S+ --group \\S+ --host" , {"pr" : ["", "", ""]}, - "groupDelGuestAccess --account \\S+ --group \\S+ --host \\S+" , {"ac" : ["", "--user", "--port"]}, - "groupDelGuestAccess --account \\S+ --group \\S+ --host \\S+ .*--user" , {"pr" : [""]}, - "groupDelGuestAccess --account \\S+ --group \\S+ --host \\S+ .*--port" , {"pr" : [""]}, - "groupDelGuestAccess --account \\S+ --group \\S+ --host \\S+ --user \\S+" , {"ac" : ["", "--port"]}, - "groupDelGuestAccess --account \\S+ --group \\S+ --host \\S+ --port \\S+" , {"ac" : ["", "--user"]}, - "groupDelGuestAccess --account \\S+ --group \\S+ --host \\S+ --(port|user) \\S+ --(port|user) \\S+" , {"pr" : [""]} + "groupDelGuestAccess" , {"ac" : ["--account"]}, + "groupDelGuestAccess +--account" , {"ac" : [""]}, + "groupDelGuestAccess +--account +\\S+" , {"ac" : ["--group"]}, + "groupDelGuestAccess +--account +\\S+ +--group" , {"ac" : [""]}, + "groupDelGuestAccess +--account +\\S+ +--group +\\S+" , {"ac" : ["--host"]}, + "groupDelGuestAccess +--account +\\S+ +--group +\\S+ +--host" , {"pr" : ["", "", ""]}, + "groupDelGuestAccess +--account +\\S+ +--group +\\S+ +--host +\\S+" , {"ac" : ["", "--user", "--port"]}, + "groupDelGuestAccess +--account +\\S+ +--group +\\S+ +--host +\\S+ +.*--user" , {"pr" : [""]}, + "groupDelGuestAccess +--account +\\S+ +--group +\\S+ +--host +\\S+ +.*--port" , {"pr" : [""]}, + "groupDelGuestAccess +--account +\\S+ +--group +\\S+ +--host +\\S+ +--user +\\S+" , {"ac" : ["", "--port"]}, + "groupDelGuestAccess +--account +\\S+ +--group +\\S+ +--host +\\S+ +--port +\\S+" , {"ac" : ["", "--user"]}, + "groupDelGuestAccess +--account +\\S+ +--group +\\S+ +--host +\\S+ +--(port|user) +\\S+ +--(port|user) +\\S+" , {"pr" : [""]} ], "master_only": true } diff --git a/bin/plugin/group-gatekeeper/groupDelMember.json b/bin/plugin/group-gatekeeper/groupDelMember.json index 915d2cacf..aeccbfa52 100644 --- a/bin/plugin/group-gatekeeper/groupDelMember.json +++ b/bin/plugin/group-gatekeeper/groupDelMember.json @@ -1,10 +1,10 @@ { "interactive": [ - "groupDelMember" , {"ac" : ["--account"]}, - "groupDelMember --account" , {"ac" : [""]}, - "groupDelMember --account \\S+" , {"ac" : ["--group"]}, - "groupDelMember --account \\S+ --group" , {"ac" : [""]}, - "groupDelMember --account \\S+ --group \\S+" , {"pr" : [""]} + "groupDelMember" , {"ac" : ["--account"]}, + "groupDelMember +--account" , {"ac" : [""]}, + "groupDelMember +--account +\\S+" , {"ac" : ["--group"]}, + "groupDelMember +--account +\\S+ +--group" , {"ac" : [""]}, + "groupDelMember +--account +\\S+ +--group +\\S+" , {"pr" : [""]} ], "master_only": true } diff --git a/bin/plugin/group-gatekeeper/groupListGuestAccesses.json b/bin/plugin/group-gatekeeper/groupListGuestAccesses.json index 6fe159229..710fd48fe 100644 --- a/bin/plugin/group-gatekeeper/groupListGuestAccesses.json +++ b/bin/plugin/group-gatekeeper/groupListGuestAccesses.json @@ -1,9 +1,9 @@ { "interactive": [ - "groupListGuestAccesses" , {"ac" : ["--account"]}, - "groupListGuestAccesses --account" , {"ac" : [""]}, - "groupListGuestAccesses --account \\S+" , {"ac" : ["--group"]}, - "groupListGuestAccesses --account \\S+ --group" , {"ac" : [""]}, - "groupListGuestAccesses --account \\S+ --group \\S+" , {"pr" : [""]} + "groupListGuestAccesses" , {"ac" : ["--account"]}, + "groupListGuestAccesses +--account" , {"ac" : [""]}, + "groupListGuestAccesses +--account +\\S+" , {"ac" : ["--group"]}, + "groupListGuestAccesses +--account +\\S+ +--group" , {"ac" : [""]}, + "groupListGuestAccesses +--account +\\S+ +--group +\\S+" , {"pr" : [""]} ] } diff --git a/bin/plugin/group-owner/groupAddAclkeeper.json b/bin/plugin/group-owner/groupAddAclkeeper.json index 7665c548a..a743664d6 100644 --- a/bin/plugin/group-owner/groupAddAclkeeper.json +++ b/bin/plugin/group-owner/groupAddAclkeeper.json @@ -1,10 +1,10 @@ { "interactive": [ - "groupAddAclkeeper" , {"ac" : ["--account"]}, - "groupAddAclkeeper --account" , {"ac" : [""]}, - "groupAddAclkeeper --account \\S+" , {"ac" : ["--group"]}, - "groupAddAclkeeper --account \\S+ --group" , {"ac" : [""]}, - "groupAddAclkeeper --account \\S+ --group \\S+" , {"pr" : [""]} + "groupAddAclkeeper" , {"ac" : ["--account"]}, + "groupAddAclkeeper +--account" , {"ac" : [""]}, + "groupAddAclkeeper +--account +\\S+" , {"ac" : ["--group"]}, + "groupAddAclkeeper +--account +\\S+ +--group" , {"ac" : [""]}, + "groupAddAclkeeper +--account +\\S+ +--group +\\S+" , {"pr" : [""]} ], "master_only": true } diff --git a/bin/plugin/group-owner/groupAddGatekeeper.json b/bin/plugin/group-owner/groupAddGatekeeper.json index 1e087567d..813cc8bea 100644 --- a/bin/plugin/group-owner/groupAddGatekeeper.json +++ b/bin/plugin/group-owner/groupAddGatekeeper.json @@ -1,10 +1,10 @@ { "interactive": [ - "groupAddGatekeeper" , {"ac" : ["--account"]}, - "groupAddGatekeeper --account" , {"ac" : [""]}, - "groupAddGatekeeper --account \\S+" , {"ac" : ["--group"]}, - "groupAddGatekeeper --account \\S+ --group" , {"ac" : [""]}, - "groupAddGatekeeper --account \\S+ --group \\S+" , {"pr" : [""]} + "groupAddGatekeeper" , {"ac" : ["--account"]}, + "groupAddGatekeeper +--account" , {"ac" : [""]}, + "groupAddGatekeeper +--account +\\S+" , {"ac" : ["--group"]}, + "groupAddGatekeeper +--account +\\S+ +--group" , {"ac" : [""]}, + "groupAddGatekeeper +--account +\\S+ +--group +\\S+" , {"pr" : [""]} ], "master_only": true } diff --git a/bin/plugin/group-owner/groupAddOwner.json b/bin/plugin/group-owner/groupAddOwner.json index 6b3cc2550..2dac723b1 100644 --- a/bin/plugin/group-owner/groupAddOwner.json +++ b/bin/plugin/group-owner/groupAddOwner.json @@ -1,10 +1,10 @@ { "interactive": [ - "groupAddOwner" , {"ac" : ["--account"]}, - "groupAddOwner --account" , {"ac" : [""]}, - "groupAddOwner --account \\S+" , {"ac" : ["--group"]}, - "groupAddOwner --account \\S+ --group" , {"ac" : [""]}, - "groupAddOwner --account \\S+ --group \\S+" , {"pr" : [""]} + "groupAddOwner" , {"ac" : ["--account"]}, + "groupAddOwner +--account" , {"ac" : [""]}, + "groupAddOwner +--account +\\S+" , {"ac" : ["--group"]}, + "groupAddOwner +--account +\\S+ +--group" , {"ac" : [""]}, + "groupAddOwner +--account +\\S+ +--group +\\S+" , {"pr" : [""]} ], "master_only": true } diff --git a/bin/plugin/group-owner/groupDelAclkeeper.json b/bin/plugin/group-owner/groupDelAclkeeper.json index 1e29b8b75..5b1252cfa 100644 --- a/bin/plugin/group-owner/groupDelAclkeeper.json +++ b/bin/plugin/group-owner/groupDelAclkeeper.json @@ -1,10 +1,10 @@ { "interactive": [ - "groupDelAclkeeper" , {"ac" : ["--account"]}, - "groupDelAclkeeper --account" , {"ac" : [""]}, - "groupDelAclkeeper --account \\S+" , {"ac" : ["--group"]}, - "groupDelAclkeeper --account \\S+ --group" , {"ac" : [""]}, - "groupDelAclkeeper --account \\S+ --group \\S+" , {"pr" : [""]} + "groupDelAclkeeper" , {"ac" : ["--account"]}, + "groupDelAclkeeper +--account" , {"ac" : [""]}, + "groupDelAclkeeper +--account +\\S+" , {"ac" : ["--group"]}, + "groupDelAclkeeper +--account +\\S+ +--group" , {"ac" : [""]}, + "groupDelAclkeeper +--account +\\S+ +--group +\\S+" , {"pr" : [""]} ], "master_only": true } diff --git a/bin/plugin/group-owner/groupDelEgressKey.json b/bin/plugin/group-owner/groupDelEgressKey.json index b97fa6159..1baa7d14f 100644 --- a/bin/plugin/group-owner/groupDelEgressKey.json +++ b/bin/plugin/group-owner/groupDelEgressKey.json @@ -1,10 +1,10 @@ { "interactive": [ - "groupDelEgressKey" , {"ac" : ["--group"]}, - "groupDelEgressKey --group" , {"ac" : [""]}, - "groupDelEgressKey --group \\S+" , {"ac" : ["--id"]}, - "groupDelEgressKey --group \\S+ --id" , {"pr" : [""]}, - "groupDelEgressKey --group \\S+ --id \\d+", {"pr" : [""]} + "groupDelEgressKey" , {"ac" : ["--group"]}, + "groupDelEgressKey +--group" , {"ac" : [""]}, + "groupDelEgressKey +--group +\\S+" , {"ac" : ["--id"]}, + "groupDelEgressKey +--group +\\S+ +--id" , {"pr" : [""]}, + "groupDelEgressKey +--group +\\S+ +--id +\\d+", {"pr" : [""]} ], "master_only": true } diff --git a/bin/plugin/group-owner/groupDelGatekeeper.json b/bin/plugin/group-owner/groupDelGatekeeper.json index 4a247551e..5147a191a 100644 --- a/bin/plugin/group-owner/groupDelGatekeeper.json +++ b/bin/plugin/group-owner/groupDelGatekeeper.json @@ -1,10 +1,10 @@ { "interactive": [ - "groupDelGatekeeper" , {"ac" : ["--account"]}, - "groupDelGatekeeper --account" , {"ac" : [""]}, - "groupDelGatekeeper --account \\S+" , {"ac" : ["--group"]}, - "groupDelGatekeeper --account \\S+ --group" , {"ac" : [""]}, - "groupDelGatekeeper --account \\S+ --group \\S+" , {"pr" : [""]} + "groupDelGatekeeper" , {"ac" : ["--account"]}, + "groupDelGatekeeper +--account" , {"ac" : [""]}, + "groupDelGatekeeper +--account +\\S+" , {"ac" : ["--group"]}, + "groupDelGatekeeper +--account +\\S+ +--group" , {"ac" : [""]}, + "groupDelGatekeeper +--account +\\S+ +--group +\\S+" , {"pr" : [""]} ], "master_only": true } diff --git a/bin/plugin/group-owner/groupDelOwner.json b/bin/plugin/group-owner/groupDelOwner.json index 9f9611483..84ae38355 100644 --- a/bin/plugin/group-owner/groupDelOwner.json +++ b/bin/plugin/group-owner/groupDelOwner.json @@ -1,10 +1,10 @@ { "interactive": [ - "groupDelOwner" , {"ac" : ["--account"]}, - "groupDelOwner --account" , {"ac" : [""]}, - "groupDelOwner --account \\S+" , {"ac" : ["--group"]}, - "groupDelOwner --account \\S+ --group" , {"ac" : [""]}, - "groupDelOwner --account \\S+ --group \\S+" , {"pr" : [""]} + "groupDelOwner" , {"ac" : ["--account"]}, + "groupDelOwner +--account" , {"ac" : [""]}, + "groupDelOwner +--account +\\S+" , {"ac" : ["--group"]}, + "groupDelOwner +--account +\\S+ +--group" , {"ac" : [""]}, + "groupDelOwner +--account +\\S+ +--group +\\S+" , {"pr" : [""]} ], "master_only": true } diff --git a/bin/plugin/group-owner/groupDestroy.json b/bin/plugin/group-owner/groupDestroy.json index e668bcc2c..eef2d6c55 100644 --- a/bin/plugin/group-owner/groupDestroy.json +++ b/bin/plugin/group-owner/groupDestroy.json @@ -1,8 +1,8 @@ { "interactive": [ - "groupDestroy" , {"ac" : ["--group"]}, - "groupDestroy --group" , {"ac" : [""]}, - "groupDestroy --group \\S+" , {"pr" : ""} + "groupDestroy" , {"ac" : ["--group"]}, + "groupDestroy +--group" , {"ac" : [""]}, + "groupDestroy +--group +\\S+" , {"pr" : ""} ], "master_only": true, "terminal_mode": "raw" diff --git a/bin/plugin/group-owner/groupGenerateEgressKey.json b/bin/plugin/group-owner/groupGenerateEgressKey.json index 471529442..227316f02 100644 --- a/bin/plugin/group-owner/groupGenerateEgressKey.json +++ b/bin/plugin/group-owner/groupGenerateEgressKey.json @@ -1,13 +1,13 @@ { "interactive": [ - "groupGenerateEgressKey" , {"ac" : ["--group"]}, - "groupGenerateEgressKey --group" , {"ac" : [""]}, - "groupGenerateEgressKey --group \\S+" , {"ac" : ["--algo"]}, - "groupGenerateEgressKey --group \\S+ --algo" , {"ac" : ["rsa", "ecdsa", "ed25519"]}, - "groupGenerateEgressKey --group \\S+ --algo \\S+" , {"ac" : ["--size"]}, - "groupGenerateEgressKey --group \\S+ --algo \\S+ --size" , {"pr" : [""]}, - "groupGenerateEgressKey --group \\S+ --algo \\S+ --size \\d+" , {"ac" : ["", "--encrypted"]}, - "groupGenerateEgressKey --group \\S+ --algo \\S+ --size \\d+ --encrypted", {"pr" : [""]} + "groupGenerateEgressKey" , {"ac" : ["--group"]}, + "groupGenerateEgressKey +--group" , {"ac" : [""]}, + "groupGenerateEgressKey +--group +\\S+" , {"ac" : ["--algo"]}, + "groupGenerateEgressKey +--group +\\S+ +--algo" , {"ac" : ["rsa", "ecdsa", "ed25519"]}, + "groupGenerateEgressKey +--group +\\S+ +--algo +\\S+" , {"ac" : ["--size"]}, + "groupGenerateEgressKey +--group +\\S+ +--algo +\\S+ +--size" , {"pr" : [""]}, + "groupGenerateEgressKey +--group +\\S+ +--algo +\\S+ +--size +\\d+" , {"ac" : ["", "--encrypted"]}, + "groupGenerateEgressKey +--group +\\S+ +--algo +\\S+ +--size +\\d+ +--encrypted", {"pr" : [""]} ], "master_only": true, "terminal_mode" : "raw" diff --git a/bin/plugin/group-owner/groupGeneratePassword.json b/bin/plugin/group-owner/groupGeneratePassword.json index 9df6641d0..7241c7e89 100644 --- a/bin/plugin/group-owner/groupGeneratePassword.json +++ b/bin/plugin/group-owner/groupGeneratePassword.json @@ -1,10 +1,10 @@ { "interactive": [ - "groupGeneratePassword" , {"ac" : ["--group"]}, - "groupGeneratePassword --group" , {"ac" : [""]}, - "groupGeneratePassword --group \\S+" , {"ac" : ["", "--size"]}, - "groupGeneratePassword --group \\S+ --size" , {"pr" : [""]}, - "groupGeneratePassword --group \\S+ --size \\d+" , {"pr" : [""]} + "groupGeneratePassword" , {"ac" : ["--group"]}, + "groupGeneratePassword +--group" , {"ac" : [""]}, + "groupGeneratePassword +--group +\\S+" , {"ac" : ["", "--size"]}, + "groupGeneratePassword +--group +\\S+ +--size" , {"pr" : [""]}, + "groupGeneratePassword +--group +\\S+ +--size +\\d+" , {"pr" : [""]} ], "master_only": true, "terminal_mode": "noecho" diff --git a/bin/plugin/group-owner/groupModify.json b/bin/plugin/group-owner/groupModify.json index def7ea88d..c66cd4da0 100644 --- a/bin/plugin/group-owner/groupModify.json +++ b/bin/plugin/group-owner/groupModify.json @@ -1,12 +1,12 @@ { "interactive": [ - "groupModify" , {"ac" : ["--group"]}, - "groupModify --group" , {"ac" : [""]}, - "groupModify --group \\S+" , {"ac" : ["--mfa-required","--guest-ttl-limit"]}, - "groupModify --group \\S+ --mfa-required" , {"ac" : ["password","totp","any","none"]}, - "groupModify --group \\S+ --mfa-required \\S+" , {"pr" : [""]}, - "groupModify --group \\S+ --guest-ttl-limit" , {"pr" : [""]}, - "groupModify --group \\S+ --guest-ttl-limit \\S+", {"pr" : [""]} + "groupModify" , {"ac" : ["--group"]}, + "groupModify +--group" , {"ac" : [""]}, + "groupModify +--group +.+--mfa-required" , {"ac" : ["password","totp","any","none"]}, + "groupModify +--group +.+--guest-ttl-limit" , {"pr" : [""]}, + "groupModify +--group +.+--idle-lock-timeout" , {"pr" : ["","0 (disable)","-1 (use bastion default)"]}, + "groupModify +--group +.+--idle-kill-timeout" , {"pr" : ["","0 (disable)","-1 (use bastion default)"]}, + "groupModify +--group +.+" , {"ac" : ["--mfa-required","--guest-ttl-limit","--idle-lock-timeout","--idle-kill-timeout",""]} ], "master_only": 1 } diff --git a/bin/plugin/group-owner/groupTransmitOwnership.json b/bin/plugin/group-owner/groupTransmitOwnership.json index 5f54454ef..d988f73b2 100644 --- a/bin/plugin/group-owner/groupTransmitOwnership.json +++ b/bin/plugin/group-owner/groupTransmitOwnership.json @@ -1,10 +1,10 @@ { "interactive": [ - "groupTransmitOwnership" , {"ac" : ["--account"]}, - "groupTransmitOwnership --account" , {"ac" : [""]}, - "groupTransmitOwnership --account \\S+" , {"ac" : ["--group"]}, - "groupTransmitOwnership --account \\S+ --group" , {"ac" : [""]}, - "groupTransmitOwnership --account \\S+ --group \\S+" , {"pr" : [""]} + "groupTransmitOwnership" , {"ac" : ["--account"]}, + "groupTransmitOwnership +--account" , {"ac" : [""]}, + "groupTransmitOwnership +--account +\\S+" , {"ac" : ["--group"]}, + "groupTransmitOwnership +--account +\\S+ +--group" , {"ac" : [""]}, + "groupTransmitOwnership +--account +\\S+ +--group +\\S+" , {"pr" : [""]} ], "master_only": true } diff --git a/bin/plugin/open/alive.json b/bin/plugin/open/alive.json index acd4410a4..d557a0385 100644 --- a/bin/plugin/open/alive.json +++ b/bin/plugin/open/alive.json @@ -1,6 +1,6 @@ { "interactive": [ - "alive" , {"pr" : [""]}, - "alive \\S+" , {"pr" : [""]} + "alive" , {"pr" : [""]}, + "alive +\\S+" , {"pr" : [""]} ] } diff --git a/bin/plugin/open/groupInfo.json b/bin/plugin/open/groupInfo.json index 104133911..936cf0f86 100644 --- a/bin/plugin/open/groupInfo.json +++ b/bin/plugin/open/groupInfo.json @@ -1,7 +1,7 @@ { "interactive": [ - "groupInfo" , {"ac" : ["--group"]}, - "groupInfo --group" , {"ac" : [""]}, - "groupInfo --group \\S+" , {"pr" : [""]} + "groupInfo" , {"ac" : ["--group"]}, + "groupInfo +--group" , {"ac" : [""]}, + "groupInfo +--group +\\S+" , {"pr" : [""]} ] } diff --git a/bin/plugin/open/groupList.json b/bin/plugin/open/groupList.json index 33d7f5095..3375f8b94 100644 --- a/bin/plugin/open/groupList.json +++ b/bin/plugin/open/groupList.json @@ -1,6 +1,6 @@ { "interactive": [ - "groupList" , {"ac" : ["", "--all"]}, - "groupList --all" , {"pr" : [""]} + "groupList" , {"ac" : ["", "--all"]}, + "groupList +--all" , {"pr" : [""]} ] } diff --git a/bin/plugin/open/groupListPasswords.json b/bin/plugin/open/groupListPasswords.json index b717ef752..4bb8335d6 100644 --- a/bin/plugin/open/groupListPasswords.json +++ b/bin/plugin/open/groupListPasswords.json @@ -1,7 +1,7 @@ { "interactive": [ - "groupListPasswords" , {"ac" : ["--group"]}, - "groupListPasswords --group" , {"ac" : [""]}, - "groupListPasswords --group \\S+" , {"pr" : [""]} + "groupListPasswords" , {"ac" : ["--group"]}, + "groupListPasswords +--group" , {"ac" : [""]}, + "groupListPasswords +--group +\\S+" , {"pr" : [""]} ] } diff --git a/bin/plugin/open/groupListServers.json b/bin/plugin/open/groupListServers.json index 9bf4e571e..c22baaeba 100644 --- a/bin/plugin/open/groupListServers.json +++ b/bin/plugin/open/groupListServers.json @@ -1,8 +1,8 @@ { "interactive": [ - "groupListServers" , {"ac" : ["--group"]}, - "groupListServers --group" , {"ac" : [""]}, - "groupListServers --group \\S+" , {"ac" : ["", "--reverse-dns"]}, - "groupListServers --group \\S+ --reverse-dns" , {"pr" : [""]} + "groupListServers" , {"ac" : ["--group"]}, + "groupListServers +--group" , {"ac" : [""]}, + "groupListServers +--group +\\S+" , {"ac" : ["", "--reverse-dns"]}, + "groupListServers +--group +\\S+ +--reverse-dns" , {"pr" : [""]} ] } diff --git a/bin/plugin/open/mtr.json b/bin/plugin/open/mtr.json index c3e04fe78..1b264d934 100644 --- a/bin/plugin/open/mtr.json +++ b/bin/plugin/open/mtr.json @@ -1,7 +1,7 @@ { "interactive": [ - "mtr" , {"ac" : ["--host"]}, - "mtr --host" , {"pr" : [""]}, - "mtr --host \\S+" , {"pr" : [""]} + "mtr" , {"ac" : ["--host"]}, + "mtr +--host" , {"pr" : [""]}, + "mtr +--host +\\S+" , {"pr" : [""]} ] } diff --git a/bin/plugin/open/nc.json b/bin/plugin/open/nc.json index d8aee53af..78e148fc3 100644 --- a/bin/plugin/open/nc.json +++ b/bin/plugin/open/nc.json @@ -1,10 +1,10 @@ { "interactive": [ - "nc" , {"ac" : ["--host"]}, - "nc --host" , {"pr" : [""]}, - "nc --host \\S+" , {"ac" : ["--port"]}, - "nc --host \\S+ --port \\d+" , {"ac" : ["", "--timeout"]}, - "nc --host \\S+ --port \\d+ --timeout" , {"pr" : [""]}, - "nc --host \\S+ --port \\d+ --timeout \\d+" , {"pr" : [""]} + "nc" , {"ac" : ["--host"]}, + "nc +--host" , {"pr" : [""]}, + "nc +--host +\\S+" , {"ac" : ["--port"]}, + "nc +--host +\\S+ +--port +\\d+" , {"ac" : ["", "--timeout"]}, + "nc +--host +\\S+ +--port +\\d+ +--timeout" , {"pr" : [""]}, + "nc +--host +\\S+ +--port +\\d+ +--timeout +\\d+" , {"pr" : [""]} ] } diff --git a/bin/plugin/open/ping.json b/bin/plugin/open/ping.json index 20ce97d78..22096d1d1 100644 --- a/bin/plugin/open/ping.json +++ b/bin/plugin/open/ping.json @@ -1,7 +1,7 @@ { "interactive": [ - "ping" , {"ac" : ["--host"]}, - "ping --host" , {"pr" : [""]}, - "ping --host \\S+" , {"pr" : [""]} + "ping" , {"ac" : ["--host"]}, + "ping +--host" , {"pr" : [""]}, + "ping +--host +\\S+" , {"pr" : [""]} ] } diff --git a/bin/plugin/open/selfAddIngressKey.json b/bin/plugin/open/selfAddIngressKey.json index 14f1eb5eb..9aadf13ae 100644 --- a/bin/plugin/open/selfAddIngressKey.json +++ b/bin/plugin/open/selfAddIngressKey.json @@ -1,9 +1,9 @@ { "interactive": [ "selfAddIngressKey" , {"ac" : ["--public-key \"",""]}, - "selfAddIngressKey --public-key \"" , {"pr" : [""]}, - "selfAddIngressKey --public-key \"[^\"]+" , {"ac" : ["\""]}, - "selfAddIngressKey --public-key \"[^\"]+\"" , {"pr" : [""]} + "selfAddIngressKey +--public-key +\"" , {"pr" : [""]}, + "selfAddIngressKey +--public-key +\"[^\"]+" , {"ac" : ["\""]}, + "selfAddIngressKey +--public-key +\"[^\"]+\"" , {"pr" : [""]} ], "master_only": true } diff --git a/bin/plugin/open/selfDelIngressKey.json b/bin/plugin/open/selfDelIngressKey.json index 2caabe28e..a8c8e873b 100644 --- a/bin/plugin/open/selfDelIngressKey.json +++ b/bin/plugin/open/selfDelIngressKey.json @@ -1,10 +1,10 @@ { "interactive": [ - "selfDelIngressKey" , {"ac" : ["--line-number-to-delete", "--fingerprint-to-delete", ""]}, - "selfDelIngressKey --line-number-to-delete" , {"pr" : [""]}, - "selfDelIngressKey --line-number-to-delete \\S+" , {"pr" : [""]}, - "selfDelIngressKey --fingerprint-to-delete" , {"pr" : [""]}, - "selfDelIngressKey --fingerprint-to-delete \\S+" , {"pr" : [""]} + "selfDelIngressKey" , {"ac" : ["--line-number-to-delete", "--fingerprint-to-delete", ""]}, + "selfDelIngressKey +--line-number-to-delete" , {"pr" : [""]}, + "selfDelIngressKey +--line-number-to-delete +\\S+" , {"pr" : [""]}, + "selfDelIngressKey +--fingerprint-to-delete" , {"pr" : [""]}, + "selfDelIngressKey +--fingerprint-to-delete +\\S+" , {"pr" : [""]} ], "master_only": true } diff --git a/bin/plugin/open/selfForgetHostKey.json b/bin/plugin/open/selfForgetHostKey.json index fd01749ec..025013616 100644 --- a/bin/plugin/open/selfForgetHostKey.json +++ b/bin/plugin/open/selfForgetHostKey.json @@ -1,9 +1,9 @@ { "interactive": [ - "selfForgetHostKey" , {"ac" : ["--host"]}, - "selfForgetHostKey --host" , {"pr" : [""]}, - "selfForgetHostKey --host \\S+" , {"ac" : ["", "--port"]}, - "selfForgetHostKey --host \\S+ --port" , {"pr" : [""]}, - "selfForgetHostKey --host \\S+ --port \\S+" , {"pr" : [""]} + "selfForgetHostKey" , {"ac" : ["--host"]}, + "selfForgetHostKey +--host" , {"pr" : [""]}, + "selfForgetHostKey +--host +\\S+" , {"ac" : ["", "--port"]}, + "selfForgetHostKey +--host +\\S+ +--port" , {"pr" : [""]}, + "selfForgetHostKey +--host +\\S+ +--port +\\S+" , {"pr" : [""]} ] } diff --git a/bin/plugin/open/selfGenerateEgressKey.json b/bin/plugin/open/selfGenerateEgressKey.json index 33d1d8b27..5f84b8395 100644 --- a/bin/plugin/open/selfGenerateEgressKey.json +++ b/bin/plugin/open/selfGenerateEgressKey.json @@ -1,11 +1,11 @@ { "interactive": [ - "selfGenerateEgressKey" , {"ac" : ["--algo"]}, - "selfGenerateEgressKey --algo" , {"ac" : ["rsa", "ecdsa", "ed25519"]}, - "selfGenerateEgressKey --algo \\S+" , {"ac" : ["--size"]}, - "selfGenerateEgressKey --algo \\S+ --size" , {"pr" : [""]}, - "selfGenerateEgressKey --algo \\S+ --size \\d+" , {"ac" : ["", "--encrypted"]}, - "selfGenerateEgressKey --algo \\S+ --size \\d+ --encrypted" , {"pr" : [""]} + "selfGenerateEgressKey" , {"ac" : ["--algo"]}, + "selfGenerateEgressKey +--algo" , {"ac" : ["rsa", "ecdsa", "ed25519"]}, + "selfGenerateEgressKey +--algo +\\S+" , {"ac" : ["--size"]}, + "selfGenerateEgressKey +--algo +\\S+ +--size" , {"pr" : [""]}, + "selfGenerateEgressKey +--algo +\\S+ +--size +\\d+" , {"ac" : ["", "--encrypted"]}, + "selfGenerateEgressKey +--algo +\\S+ +--size +\\d+ +--encrypted" , {"pr" : [""]} ], "master_only": true, "terminal_mode": "raw" diff --git a/bin/plugin/open/selfGeneratePassword.json b/bin/plugin/open/selfGeneratePassword.json index 0e0050364..cc1c10fcb 100644 --- a/bin/plugin/open/selfGeneratePassword.json +++ b/bin/plugin/open/selfGeneratePassword.json @@ -1,8 +1,8 @@ { "interactive": [ - "selfGeneratePassword" , {"ac" : ["--size",""]}, - "selfGeneratePassword --size" , {"pr" : [""]}, - "selfGeneratePassword --size \\S+" , {"pr" : [""]} + "selfGeneratePassword" , {"ac" : ["--size",""]}, + "selfGeneratePassword +--size" , {"pr" : [""]}, + "selfGeneratePassword +--size +\\S+" , {"pr" : [""]} ], "master_only": true, "terminal_mode": "noecho" diff --git a/bin/plugin/open/selfGenerateProxyPassword.json b/bin/plugin/open/selfGenerateProxyPassword.json index 801c2633d..8764e3c8b 100644 --- a/bin/plugin/open/selfGenerateProxyPassword.json +++ b/bin/plugin/open/selfGenerateProxyPassword.json @@ -1,8 +1,8 @@ { "interactive": [ - "selfGenerateProxyPassword" , {"ac" : ["--size",""]}, - "selfGenerateProxyPassword --size" , {"pr" : [""]}, - "selfGenerateProxyPassword --size \\S+" , {"ac" : [""]} + "selfGenerateProxyPassword" , {"ac" : ["--size",""]}, + "selfGenerateProxyPassword +--size" , {"pr" : [""]}, + "selfGenerateProxyPassword +--size +\\S+" , {"ac" : [""]} ], "master_only": true, "terminal_mode": "noecho" diff --git a/bin/plugin/open/selfListAccesses.json b/bin/plugin/open/selfListAccesses.json index a01e09bf3..4d86f8ab0 100644 --- a/bin/plugin/open/selfListAccesses.json +++ b/bin/plugin/open/selfListAccesses.json @@ -1,8 +1,8 @@ { "interactive": [ - "selfListAccesses" , {"ac" : ["", "--hide-groups", "--reverse-dns"]}, - "selfListAccesses --hide-groups" , {"ac" : ["", "--reverse-dns"]}, - "selfListAccesses --reverse-dns" , {"ac" : ["", "--hide-groups"]}, - "selfListAccesses --(reverse-dns|hide-groups) --(reverse-dns|hide-groups)" , {"pr" : [""]} + "selfListAccesses" , {"ac" : ["", "--hide-groups", "--reverse-dns"]}, + "selfListAccesses +--hide-groups" , {"ac" : ["", "--reverse-dns"]}, + "selfListAccesses +--reverse-dns" , {"ac" : ["", "--hide-groups"]}, + "selfListAccesses +--(reverse-dns|hide-groups) +--(reverse-dns|hide-groups)" , {"pr" : [""]} ] } diff --git a/bin/plugin/open/selfPlaySession.json b/bin/plugin/open/selfPlaySession.json index 57791cf58..b183bd933 100644 --- a/bin/plugin/open/selfPlaySession.json +++ b/bin/plugin/open/selfPlaySession.json @@ -1,8 +1,8 @@ { "interactive": [ - "selfPlaySession" , {"ac" : ["--id"]}, - "selfPlaySession --id" , {"pr" : [""]}, - "selfPlaySession --id \\S+" , {"pr" : [""]} + "selfPlaySession" , {"ac" : ["--id"]}, + "selfPlaySession +--id" , {"pr" : [""]}, + "selfPlaySession +--id +\\S+" , {"pr" : [""]} ], "terminal_mode": "cbreak", "execution_mode": "binary" diff --git a/bin/plugin/restricted/accountAddPersonalAccess.json b/bin/plugin/restricted/accountAddPersonalAccess.json index 7f372d682..5b5a55901 100644 --- a/bin/plugin/restricted/accountAddPersonalAccess.json +++ b/bin/plugin/restricted/accountAddPersonalAccess.json @@ -1,25 +1,25 @@ { "interactive": [ - "accountAddPersonalAccess" , {"ac" : ["--account"]}, - "accountAddPersonalAccess --account" , {"ac" : [""]}, - "accountAddPersonalAccess --account \\S+" , {"ac" : ["--host"]}, - "accountAddPersonalAccess --account \\S+ --host" , {"pr" : ["", "", ""]}, - "accountAddPersonalAccess --account \\S+ --host \\S+" , {"ac" : ["", "--user", "--port"]}, - "accountAddPersonalAccess --account \\S+ --host \\S+ .*--user" , {"pr" : [""]}, - "accountAddPersonalAccess --account \\S+ --host \\S+ .*--port" , {"pr" : [""]}, - "accountAddPersonalAccess --account \\S+ --host \\S+ --user \\S+" , {"ac" : ["", "--port"]}, - "accountAddPersonalAccess --account \\S+ --host \\S+ --port \\S+" , {"ac" : ["", "--user"]}, - "accountAddPersonalAccess --account \\S+ --host \\S+ --(port|user) \\S+ --(port|user) \\S+" , {"ac" : ["--force-key","--force-password","--ttl",""]}, - "accountAddPersonalAccess --account \\S+ --host \\S+ --(port|user) \\S+ --(port|user) \\S+ --ttl" , {"pr" : [""]}, - "accountAddPersonalAccess --account \\S+ --host \\S+ --(port|user) \\S+ --(port|user) \\S+ --ttl \\S+" , {"ac" : ["--force-key","--force-password",""]}, - "accountAddPersonalAccess --account \\S+ --host \\S+ --(port|user) \\S+ --(port|user) \\S+ --ttl \\S+ --force-key" , {"pr" : [""]}, - "accountAddPersonalAccess --account \\S+ --host \\S+ --(port|user) \\S+ --(port|user) \\S+ --ttl \\S+ --force-password" , {"pr" : [""]}, - "accountAddPersonalAccess --account \\S+ --host \\S+ --(port|user) \\S+ --(port|user) \\S+ --ttl \\S+ --force-(key|password) \\S+" , {"pr" : [""]}, - "accountAddPersonalAccess --account \\S+ --host \\S+ --(port|user) \\S+ --(port|user) \\S+ --force-key" , {"pr" : [""]}, - "accountAddPersonalAccess --account \\S+ --host \\S+ --(port|user) \\S+ --(port|user) \\S+ --force-password" , {"pr" : [""]}, - "accountAddPersonalAccess --account \\S+ --host \\S+ --(port|user) \\S+ --(port|user) \\S+ --force-(key|password) \\S+" , {"ac" : ["--ttl",""]}, - "accountAddPersonalAccess --account \\S+ --host \\S+ --(port|user) \\S+ --(port|user) \\S+ --force-(key|password) \\S+ --ttl" , {"pr" : [""]}, - "accountAddPersonalAccess --account \\S+ --host \\S+ --(port|user) \\S+ --(port|user) \\S+ --force-(key|password) \\S+ --ttl \\S+" , {"pr" : [""]} + "accountAddPersonalAccess" , {"ac" : ["--account"]}, + "accountAddPersonalAccess +--account" , {"ac" : [""]}, + "accountAddPersonalAccess +--account +\\S+" , {"ac" : ["--host"]}, + "accountAddPersonalAccess +--account +\\S+ +--host" , {"pr" : ["", "", ""]}, + "accountAddPersonalAccess +--account +\\S+ +--host +\\S+" , {"ac" : ["", "--user", "--port"]}, + "accountAddPersonalAccess +--account +\\S+ +--host +\\S+ +.*--user" , {"pr" : [""]}, + "accountAddPersonalAccess +--account +\\S+ +--host +\\S+ +.*--port" , {"pr" : [""]}, + "accountAddPersonalAccess +--account +\\S+ +--host +\\S+ +--user +\\S+" , {"ac" : ["", "--port"]}, + "accountAddPersonalAccess +--account +\\S+ +--host +\\S+ +--port +\\S+" , {"ac" : ["", "--user"]}, + "accountAddPersonalAccess +--account +\\S+ +--host +\\S+ +--(port|user) +\\S+ +--(port|user) +\\S+" , {"ac" : ["--force-key","--force-password","--ttl",""]}, + "accountAddPersonalAccess +--account +\\S+ +--host +\\S+ +--(port|user) +\\S+ +--(port|user) +\\S+ +--ttl" , {"pr" : [""]}, + "accountAddPersonalAccess +--account +\\S+ +--host +\\S+ +--(port|user) +\\S+ +--(port|user) +\\S+ +--ttl \\S+" , {"ac" : ["--force-key","--force-password",""]}, + "accountAddPersonalAccess +--account +\\S+ +--host +\\S+ +--(port|user) +\\S+ +--(port|user) +\\S+ +--ttl \\S+ --force-key" , {"pr" : [""]}, + "accountAddPersonalAccess +--account +\\S+ +--host +\\S+ +--(port|user) +\\S+ +--(port|user) +\\S+ +--ttl \\S+ --force-password" , {"pr" : [""]}, + "accountAddPersonalAccess +--account +\\S+ +--host +\\S+ +--(port|user) +\\S+ +--(port|user) +\\S+ +--ttl \\S+ --force-(key|password) \\S+" , {"pr" : [""]}, + "accountAddPersonalAccess +--account +\\S+ +--host +\\S+ +--(port|user) +\\S+ +--(port|user) +\\S+ +--force-key" , {"pr" : [""]}, + "accountAddPersonalAccess +--account +\\S+ +--host +\\S+ +--(port|user) +\\S+ +--(port|user) +\\S+ +--force-password" , {"pr" : [""]}, + "accountAddPersonalAccess +--account +\\S+ +--host +\\S+ +--(port|user) +\\S+ +--(port|user) +\\S+ +--force-(key|password) +\\S+" , {"ac" : ["--ttl",""]}, + "accountAddPersonalAccess +--account +\\S+ +--host +\\S+ +--(port|user) +\\S+ +--(port|user) +\\S+ +--force-(key|password) +\\S+ +--ttl" , {"pr" : [""]}, + "accountAddPersonalAccess +--account +\\S+ +--host +\\S+ +--(port|user) +\\S+ +--(port|user) +\\S+ +--force-(key|password) +\\S+ +--ttl +\\S+" , {"pr" : [""]} ], "master_only": true } diff --git a/bin/plugin/restricted/accountCreate.json b/bin/plugin/restricted/accountCreate.json index fb4c5af91..be71a98ce 100644 --- a/bin/plugin/restricted/accountCreate.json +++ b/bin/plugin/restricted/accountCreate.json @@ -1,13 +1,13 @@ { "interactive": [ - "accountCreate" , {"ac" : ["--account"]}, - "accountCreate --account" , {"pr" : [""]}, - "accountCreate --account \\S+" , {"ac" : ["--uid","--uid-auto"]}, - "accountCreate --account \\S+ --uid" , {"pr" : [""]}, - "accountCreate --account \\S+ --uid( \\S+|-auto)" , {"ac" : ["", "--always-active", "--comment"]}, - "accountCreate --account \\S+ --uid( \\S+|-auto) --always-active" , {"ac" : ["", "--comment"]}, - "accountCreate --account \\S+ --uid( \\S+|-auto) .*--comment" , {"pr" : [""]}, - "accountCreate --account \\S+ --uid( \\S+|-auto) (--always-active --comment \\S+|--comment \\S+ --always-active)" , {"pr" : [""]} + "accountCreate" , {"ac" : ["--account"]}, + "accountCreate +--account" , {"pr" : [""]}, + "accountCreate +--account +\\S+" , {"ac" : ["--uid","--uid-auto"]}, + "accountCreate +--account +\\S+ +--uid" , {"pr" : [""]}, + "accountCreate +--account +\\S+ +--uid( +\\S+|-auto)" , {"ac" : ["", "--always-active", "--comment"]}, + "accountCreate +--account +\\S+ +--uid( +\\S+|-auto) +--always-active" , {"ac" : ["", "--comment"]}, + "accountCreate +--account +\\S+ +--uid( +\\S+|-auto) +.*--comment" , {"pr" : [""]}, + "accountCreate +--account +\\S+ +--uid( +\\S+|-auto) +(--always-active +--comment +\\S+|--comment +\\S+ +--always-active)" , {"pr" : [""]} ], "master_only": true, "terminal_mode": "raw" diff --git a/bin/plugin/restricted/accountDelPersonalAccess.json b/bin/plugin/restricted/accountDelPersonalAccess.json index 11c48ed17..2d1118f2d 100644 --- a/bin/plugin/restricted/accountDelPersonalAccess.json +++ b/bin/plugin/restricted/accountDelPersonalAccess.json @@ -1,15 +1,15 @@ { "interactive": [ - "accountDelPersonalAccess" , {"ac" : ["--account"]}, - "accountDelPersonalAccess --account" , {"ac" : [""]}, - "accountDelPersonalAccess --account \\S+" , {"ac" : ["--host"]}, - "accountDelPersonalAccess --account \\S+ --host" , {"pr" : ["", "", ""]}, - "accountDelPersonalAccess --account \\S+ --host \\S+" , {"ac" : ["", "--user", "--port"]}, - "accountDelPersonalAccess --account \\S+ --host \\S+ .*--user" , {"pr" : [""]}, - "accountDelPersonalAccess --account \\S+ --host \\S+ .*--port" , {"pr" : [""]}, - "accountDelPersonalAccess --account \\S+ --host \\S+ --user \\S+" , {"ac" : ["", "--port"]}, - "accountDelPersonalAccess --account \\S+ --host \\S+ --port \\S+" , {"ac" : ["", "--user"]}, - "accountDelPersonalAccess --account \\S+ --host \\S+ --(port|user) \\S+ --(port|user) \\S+" , {"pr" : [""]} + "accountDelPersonalAccess" , {"ac" : ["--account"]}, + "accountDelPersonalAccess +--account" , {"ac" : [""]}, + "accountDelPersonalAccess +--account +\\S+" , {"ac" : ["--host"]}, + "accountDelPersonalAccess +--account +\\S+ +--host" , {"pr" : ["", "", ""]}, + "accountDelPersonalAccess +--account +\\S+ +--host +\\S+" , {"ac" : ["", "--user", "--port"]}, + "accountDelPersonalAccess +--account +\\S+ +--host +\\S+ +.*--user" , {"pr" : [""]}, + "accountDelPersonalAccess +--account +\\S+ +--host +\\S+ +.*--port" , {"pr" : [""]}, + "accountDelPersonalAccess +--account +\\S+ +--host +\\S+ +--user +\\S+" , {"ac" : ["", "--port"]}, + "accountDelPersonalAccess +--account +\\S+ +--host +\\S+ +--port +\\S+" , {"ac" : ["", "--user"]}, + "accountDelPersonalAccess +--account +\\S+ +--host +\\S+ +--(port|user) +\\S+ +--(port|user) +\\S+" , {"pr" : [""]} ], "master_only": true } diff --git a/bin/plugin/restricted/accountDelete.json b/bin/plugin/restricted/accountDelete.json index 2c0b794a3..053fd1f10 100644 --- a/bin/plugin/restricted/accountDelete.json +++ b/bin/plugin/restricted/accountDelete.json @@ -1,10 +1,10 @@ { "interactive": [ - "accountDelete" , {"ac" : ["--account"]}, - "accountDelete --account" , {"ac" : [""]}, - "accountDelete --account \\S+" , {"ac" : ["", "--comment"]}, - "accountDelete --account \\S+ --comment" , {"pr" : [""]}, - "accountDelete --account \\S+ --comment \\S+" , {"pr" : [""]} + "accountDelete" , {"ac" : ["--account"]}, + "accountDelete +--account" , {"ac" : [""]}, + "accountDelete +--account +\\S+" , {"ac" : ["", "--comment"]}, + "accountDelete +--account +\\S+ +--comment" , {"pr" : [""]}, + "accountDelete +--account +\\S+ +--comment +\\S+" , {"pr" : [""]} ], "master_only": true } diff --git a/bin/plugin/restricted/accountFreeze.json b/bin/plugin/restricted/accountFreeze.json index 94a581e6d..0d7fbb5be 100644 --- a/bin/plugin/restricted/accountFreeze.json +++ b/bin/plugin/restricted/accountFreeze.json @@ -1,10 +1,10 @@ { "interactive": [ - "accountFreeze" , {"ac" : ["--account"]}, - "accountFreeze --account" , {"ac" : [""]}, - "accountFreeze --account \\S+" , {"ac" : ["--reason",""]}, - "accountFreeze --account \\S+ --reason" , {"pr" : ["\"reason between quotes\""]}, - "accountFreeze --account \\S+ --reason .+" , {"pr" : [""]} + "accountFreeze" , {"ac" : ["--account"]}, + "accountFreeze +--account" , {"ac" : [""]}, + "accountFreeze +--account +\\S+" , {"ac" : ["--reason",""]}, + "accountFreeze +--account +\\S+ +--reason" , {"pr" : ["\"reason between quotes\""]}, + "accountFreeze +--account +\\S+ +--reason +.+" , {"pr" : [""]} ], "master_only": 1 } diff --git a/bin/plugin/restricted/accountGeneratePassword.json b/bin/plugin/restricted/accountGeneratePassword.json index a5a00a508..3a84b6a23 100644 --- a/bin/plugin/restricted/accountGeneratePassword.json +++ b/bin/plugin/restricted/accountGeneratePassword.json @@ -1,10 +1,10 @@ { "interactive": [ - "accountGeneratePassword" , {"ac" : ["--account"]}, - "accountGeneratePassword --account" , {"ac" : [""]}, - "accountGeneratePassword --account \\S+" , {"ac" : ["--size",""]}, - "accountGeneratePassword --account \\S+ --size" , {"pr" : [""]}, - "accountGeneratePassword --account \\S+ --size \\S+" , {"pr" : [""]} + "accountGeneratePassword" , {"ac" : ["--account"]}, + "accountGeneratePassword +--account" , {"ac" : [""]}, + "accountGeneratePassword +--account +\\S+" , {"ac" : ["--size",""]}, + "accountGeneratePassword +--account +\\S+ +--size" , {"pr" : [""]}, + "accountGeneratePassword +--account +\\S+ +--size +\\S+" , {"pr" : [""]} ], "master_only": true, "terminal_mode": "noecho" diff --git a/bin/plugin/restricted/accountGrantCommand.json b/bin/plugin/restricted/accountGrantCommand.json index fd8b290a8..3c1a2a781 100644 --- a/bin/plugin/restricted/accountGrantCommand.json +++ b/bin/plugin/restricted/accountGrantCommand.json @@ -1,10 +1,10 @@ { "interactive": [ - "accountGrantCommand" , {"ac" : ["--account"]}, - "accountGrantCommand --account" , {"ac" : [""]}, - "accountGrantCommand --account \\S+" , {"ac" : ["--command"]}, - "accountGrantCommand --account \\S+ --command" , {"ac" : [""]}, - "accountGrantCommand --account \\S+ --command \\S+" , {"pr" : [""]} + "accountGrantCommand" , {"ac" : ["--account"]}, + "accountGrantCommand +--account" , {"ac" : [""]}, + "accountGrantCommand +--account +\\S+" , {"ac" : ["--command"]}, + "accountGrantCommand +--account +\\S+ +--command" , {"ac" : [""]}, + "accountGrantCommand +--account +\\S+ +--command +\\S+" , {"pr" : [""]} ], "master_only": true } diff --git a/bin/plugin/restricted/accountInfo.json b/bin/plugin/restricted/accountInfo.json index 7b0cc423c..3d61655a0 100644 --- a/bin/plugin/restricted/accountInfo.json +++ b/bin/plugin/restricted/accountInfo.json @@ -1,7 +1,7 @@ { "interactive": [ - "accountInfo" , {"ac" : ["--account"]}, - "accountInfo --account" , {"ac" : [""]}, - "accountInfo --account \\S+" , {"pr" : [""]} + "accountInfo" , {"ac" : ["--account"]}, + "accountInfo +--account" , {"ac" : [""]}, + "accountInfo +--account +\\S+" , {"pr" : [""]} ] } diff --git a/bin/plugin/restricted/accountList.json b/bin/plugin/restricted/accountList.json index 046c194b6..eb6c04d3b 100644 --- a/bin/plugin/restricted/accountList.json +++ b/bin/plugin/restricted/accountList.json @@ -1,9 +1,9 @@ { "interactive": [ - "accountList" , {"ac" : ["--inactive-only","--realm-only","--account"]}, - "accountList --account" , {"ac" : [""]}, - "accountList --account \\S+" , {"pr" : [""]}, - "accountList --inactive-only" , {"pr" : [""]}, - "accountList --realm-only" , {"pr" : [""]} + "accountList" , {"ac" : ["--inactive-only","--realm-only","--account"]}, + "accountList +--account" , {"ac" : [""]}, + "accountList +--account +\\S+" , {"pr" : [""]}, + "accountList +--inactive-only" , {"pr" : [""]}, + "accountList +--realm-only" , {"pr" : [""]} ] } diff --git a/bin/plugin/restricted/accountListAccesses.json b/bin/plugin/restricted/accountListAccesses.json index 84a2d4820..fb3d1655f 100644 --- a/bin/plugin/restricted/accountListAccesses.json +++ b/bin/plugin/restricted/accountListAccesses.json @@ -1,10 +1,10 @@ { "interactive": [ - "accountListAccesses" , {"ac" : ["--account"]}, - "accountListAccesses --account" , {"ac" : [""]}, - "accountListAccesses --account \\S+" , {"ac" : ["", "--hide-groups", "--reverse-dns"]}, - "accountListAccesses --account \\S+ --hide-groups" , {"ac" : ["", "--reverse-dns"]}, - "accountListAccesses --account \\S+ --reverse-dns" , {"ac" : ["", "--hide-groups"]}, - "accountListAccesses --account \\S+ --(reverse-dns|hide-groups) --(reverse-dns|hide-groups)" , {"pr" : [""]} + "accountListAccesses" , {"ac" : ["--account"]}, + "accountListAccesses +--account" , {"ac" : [""]}, + "accountListAccesses +--account +\\S+" , {"ac" : ["", "--hide-groups", "--reverse-dns"]}, + "accountListAccesses +--account +\\S+ +--hide-groups" , {"ac" : ["", "--reverse-dns"]}, + "accountListAccesses +--account +\\S+ +--reverse-dns" , {"ac" : ["", "--hide-groups"]}, + "accountListAccesses +--account +\\S+ +--(reverse-dns|hide-groups) +--(reverse-dns|hide-groups)" , {"pr" : [""]} ] } diff --git a/bin/plugin/restricted/accountListEgressKeys.json b/bin/plugin/restricted/accountListEgressKeys.json index 29bbaa8cc..d44088fbd 100644 --- a/bin/plugin/restricted/accountListEgressKeys.json +++ b/bin/plugin/restricted/accountListEgressKeys.json @@ -1,7 +1,7 @@ { "interactive": [ - "accountListEgressKeys" , {"ac" : ["--account"]}, - "accountListEgressKeys --account" , {"ac" : [""]}, - "accountListEgressKeys --account \\S+" , {"pr" : [""]} + "accountListEgressKeys" , {"ac" : ["--account"]}, + "accountListEgressKeys +--account" , {"ac" : [""]}, + "accountListEgressKeys +--account +\\S+" , {"pr" : [""]} ] } diff --git a/bin/plugin/restricted/accountListIngressKeys.json b/bin/plugin/restricted/accountListIngressKeys.json index 719e87445..2760e92c5 100644 --- a/bin/plugin/restricted/accountListIngressKeys.json +++ b/bin/plugin/restricted/accountListIngressKeys.json @@ -1,7 +1,7 @@ { "interactive": [ - "accountListIngressKeys" , {"ac" : ["--account"]}, - "accountListIngressKeys --account" , {"ac" : [""]}, - "accountListIngressKeys --account \\S+" , {"pr" : [""]} + "accountListIngressKeys" , {"ac" : ["--account"]}, + "accountListIngressKeys +--account" , {"ac" : [""]}, + "accountListIngressKeys +--account +\\S+" , {"pr" : [""]} ] } diff --git a/bin/plugin/restricted/accountListPasswords.json b/bin/plugin/restricted/accountListPasswords.json index 884ef1b45..da1babe77 100644 --- a/bin/plugin/restricted/accountListPasswords.json +++ b/bin/plugin/restricted/accountListPasswords.json @@ -1,7 +1,7 @@ { "interactive": [ - "accountListPasswords" , {"ac" : ["--account"]}, - "accountListPasswords --account" , {"ac" : [""]}, - "accountListPasswords --account \\S+" , {"pr" : [""]} + "accountListPasswords" , {"ac" : ["--account"]}, + "accountListPasswords +--account" , {"ac" : [""]}, + "accountListPasswords +--account +\\S+" , {"pr" : [""]} ] } diff --git a/bin/plugin/restricted/accountMFAResetPassword.json b/bin/plugin/restricted/accountMFAResetPassword.json index 2987459b0..7494c9683 100644 --- a/bin/plugin/restricted/accountMFAResetPassword.json +++ b/bin/plugin/restricted/accountMFAResetPassword.json @@ -1,8 +1,8 @@ { "interactive": [ - "accountMFAResetPassword" , {"ac" : ["--account"]}, - "accountMFAResetPassword --account" , {"ac" : [""]}, - "accountMFAResetPassword --account \\S+" , {"pr" : [""]} + "accountMFAResetPassword" , {"ac" : ["--account"]}, + "accountMFAResetPassword +--account" , {"ac" : [""]}, + "accountMFAResetPassword +--account +\\S+" , {"pr" : [""]} ], "master_only": true } diff --git a/bin/plugin/restricted/accountMFAResetTOTP.json b/bin/plugin/restricted/accountMFAResetTOTP.json index 6cd574b17..5586b8ada 100644 --- a/bin/plugin/restricted/accountMFAResetTOTP.json +++ b/bin/plugin/restricted/accountMFAResetTOTP.json @@ -1,8 +1,8 @@ { "interactive": [ - "accountMFAResetTOTP" , {"ac" : ["--account"]}, - "accountMFAResetTOTP --account" , {"ac" : [""]}, - "accountMFAResetTOTP --account \\S+" , {"pr" : [""]} + "accountMFAResetTOTP" , {"ac" : ["--account"]}, + "accountMFAResetTOTP +--account" , {"ac" : [""]}, + "accountMFAResetTOTP +--account +\\S+" , {"pr" : [""]} ], "master_only": true } diff --git a/bin/plugin/restricted/accountModify.json b/bin/plugin/restricted/accountModify.json index 81d89330e..34527a917 100644 --- a/bin/plugin/restricted/accountModify.json +++ b/bin/plugin/restricted/accountModify.json @@ -1,13 +1,13 @@ { "master_only": true, "interactive": [ - "accountModify" , {"ac": ["--account"]}, - "accountModify --account" , {"ac": [""]}, - "accountModify --account \\S+" , {"ac": ["--mfa-password-required","--mfa-totp-required","--pam-auth-bypass","--always-active","--egress-strict-host-key-checking","--personal-egress-mfa-required","--idle-ignore","--pubkey-auth-optional"]}, - "accountModify --account \\S+ .*(--mfa-password-required|--mfa-totp-required)" , {"ac": ["yes","no","bypass"]}, - "accountModify --account \\S+ .*(--pam-auth-bypass|--mfa-auth-bypass|--always-active|idle-ignore|--pubkey-auth-optional)", {"ac": ["yes","no"]}, - "accountModify --account \\S+ .*(--egress-strict-host-key-checking)" , {"ac": ["yes","accept-new","no","ask","default","bypass"]}, - "accountModify --account \\S+ .*(--personal-egress-mfa-required)" , {"ac": ["password","totp","any","none"]}, - "accountModify --account \\S+ .*(yes|accept-new|no|bypass|ask|default|totp|password|none)" , {"ac": ["--mfa-password-required","--mfa-totp-required","--pam-auth-bypass","--always-active","--egress-strict-host-key-checking","--personal-egress-mfa-required","--idle-ignore","--pubkey-auth-optional",""]} + "accountModify" , {"ac": ["--account"]}, + "accountModify +--account" , {"ac": [""]}, + "accountModify +--account +\\S+ +.*(--mfa-password-required|--mfa-totp-required)" , {"ac": ["yes","no","bypass"]}, + "accountModify +--account +\\S+ +.*(--pam-auth-bypass|--mfa-auth-bypass|--always-active|idle-ignore|--pubkey-auth-optional)", {"ac": ["yes","no"]}, + "accountModify +--account +\\S+ +.*(--egress-strict-host-key-checking)" , {"ac": ["yes","accept-new","no","ask","default","bypass"]}, + "accountModify +--account +\\S+ +.*(--personal-egress-mfa-required)" , {"ac": ["password","totp","any","none"]}, + "accountModify +--account +\\S+ +.*(--max-inactive-days)" , {"pr": [""]}, + "accountModify +--account +\\S+ +.*" , {"ac": ["","--mfa-password-required","--mfa-totp-required","--pam-auth-bypass","--always-active","--egress-strict-host-key-checking","--personal-egress-mfa-required","--idle-ignore","--pubkey-auth-optional","--max-inactive-days","--osh-only"]} ] } diff --git a/bin/plugin/restricted/accountPIV.json b/bin/plugin/restricted/accountPIV.json index 7a812d79f..674549ea5 100644 --- a/bin/plugin/restricted/accountPIV.json +++ b/bin/plugin/restricted/accountPIV.json @@ -1,13 +1,13 @@ { "interactive": [ - "accountPIV" , {"ac": ["--account"]}, - "accountPIV --account" , {"ac": [""]}, - "accountPIV --account \\S+" , {"ac": ["--policy"]}, - "accountPIV --account \\S+ --policy" , {"ac": ["default","enforce","never","grace"]}, - "accountPIV --account \\S+ --policy (default|enforce|never|grace)" , {"pr": [""]}, - "accountPIV --account \\S+ --policy grace" , {"ac": ["--ttl"]}, - "accountPIV --account \\S+ --policy grace --ttl" , {"pr": [""]}, - "accountPIV --account \\S+ --policy grace --ttl (.*)" , {"pr": [""]} + "accountPIV" , {"ac": ["--account"]}, + "accountPIV +--account" , {"ac": [""]}, + "accountPIV +--account +\\S+" , {"ac": ["--policy"]}, + "accountPIV +--account +\\S+ +--policy" , {"ac": ["default","enforce","never","grace"]}, + "accountPIV +--account +\\S+ +--policy +(default|enforce|never|grace)" , {"pr": [""]}, + "accountPIV +--account +\\S+ +--policy +grace" , {"ac": ["--ttl"]}, + "accountPIV +--account +\\S+ +--policy +grace +--ttl" , {"pr": [""]}, + "accountPIV +--account +\\S+ +--policy +grace +--ttl +(.*)" , {"pr": [""]} ], "master_only": 1 } diff --git a/bin/plugin/restricted/accountRevokeCommand.json b/bin/plugin/restricted/accountRevokeCommand.json index 3e7d35d40..d7eba1ed6 100644 --- a/bin/plugin/restricted/accountRevokeCommand.json +++ b/bin/plugin/restricted/accountRevokeCommand.json @@ -1,10 +1,10 @@ { "interactive": [ - "accountRevokeCommand" , {"ac" : ["--account"]}, - "accountRevokeCommand --account" , {"ac" : [""]}, - "accountRevokeCommand --account \\S+" , {"ac" : ["--command"]}, - "accountRevokeCommand --account \\S+ --command" , {"ac" : [""]}, - "accountRevokeCommand --account \\S+ --command \\S+" , {"pr" : [""]} + "accountRevokeCommand" , {"ac" : ["--account"]}, + "accountRevokeCommand +--account" , {"ac" : [""]}, + "accountRevokeCommand +--account +\\S+" , {"ac" : ["--command"]}, + "accountRevokeCommand +--account +\\S+ +--command" , {"ac" : [""]}, + "accountRevokeCommand +--account +\\S+ +--command +\\S+" , {"pr" : [""]} ], "master_only": 1 } diff --git a/bin/plugin/restricted/accountUnexpire.json b/bin/plugin/restricted/accountUnexpire.json index 43d8ef255..6b48b57b2 100644 --- a/bin/plugin/restricted/accountUnexpire.json +++ b/bin/plugin/restricted/accountUnexpire.json @@ -1,7 +1,7 @@ { "interactive": [ - "accountUnexpire" , {"ac" : ["--account"]}, - "accountUnexpire --account" , {"ac" : [""]}, - "accountUnexpire --account \\S+" , {"pr" : [""]} + "accountUnexpire" , {"ac" : ["--account"]}, + "accountUnexpire +--account" , {"ac" : [""]}, + "accountUnexpire +--account +\\S+" , {"pr" : [""]} ] } diff --git a/bin/plugin/restricted/accountUnfreeze.json b/bin/plugin/restricted/accountUnfreeze.json index f8dbdbf2c..74d998c32 100644 --- a/bin/plugin/restricted/accountUnfreeze.json +++ b/bin/plugin/restricted/accountUnfreeze.json @@ -1,8 +1,8 @@ { "interactive": [ - "accountUnfreeze" , {"ac" : ["--account"]}, - "accountUnfreeze --account" , {"ac" : [""]}, - "accountUnfreeze --account \\S+" , {"pr" : [""]} + "accountUnfreeze" , {"ac" : ["--account"]}, + "accountUnfreeze +--account" , {"ac" : [""]}, + "accountUnfreeze +--account +\\S+" , {"pr" : [""]} ], "master_only": 1 } diff --git a/bin/plugin/restricted/accountUnlock.json b/bin/plugin/restricted/accountUnlock.json index 36af11422..5c3a4b2df 100644 --- a/bin/plugin/restricted/accountUnlock.json +++ b/bin/plugin/restricted/accountUnlock.json @@ -1,8 +1,8 @@ { "interactive": [ - "accountUnlock" , {"ac" : ["--account"]}, - "accountUnlock --account" , {"ac" : [""]}, - "accountUnlock --account \\S+" , {"pr" : [""]} + "accountUnlock" , {"ac" : ["--account"]}, + "accountUnlock +--account" , {"ac" : [""]}, + "accountUnlock +--account +\\S+" , {"pr" : [""]} ], "master_only": 1 } diff --git a/bin/plugin/restricted/groupCreate.json b/bin/plugin/restricted/groupCreate.json index 87f40c343..4cea0460c 100644 --- a/bin/plugin/restricted/groupCreate.json +++ b/bin/plugin/restricted/groupCreate.json @@ -1,15 +1,15 @@ { "interactive": [ - "groupCreate" , {"ac" : ["--group"]}, - "groupCreate --group" , {"pr" : [""]}, - "groupCreate --group \\S+" , {"ac" : ["--owner"]}, - "groupCreate --group \\S+ --owner" , {"ac" : [""]}, - "groupCreate --group \\S+ --owner \\S+" , {"ac" : ["--algo"]}, - "groupCreate --group \\S+ --owner \\S+ --algo" , {"ac" : ["rsa", "ecdsa", "ed25519"]}, - "groupCreate --group \\S+ --owner \\S+ --algo \\S+" , {"ac" : ["--size"]}, - "groupCreate --group \\S+ --owner \\S+ --algo \\S+ --size" , {"pr" : [""]}, - "groupCreate --group \\S+ --owner \\S+ --algo \\S+ --size \\d+" , {"ac" : ["", "--encrypted"]}, - "groupCreate --group \\S+ --owner \\S+ --algo \\S+ --size \\d+ --encrypted" , {"pr" : [""]} + "groupCreate" , {"ac" : ["--group"]}, + "groupCreate +--group" , {"pr" : [""]}, + "groupCreate +--group +\\S+" , {"ac" : ["--owner"]}, + "groupCreate +--group +\\S+ +--owner" , {"ac" : [""]}, + "groupCreate +--group +\\S+ +--owner +\\S+" , {"ac" : ["--algo"]}, + "groupCreate +--group +\\S+ +--owner +\\S+ +--algo" , {"ac" : ["rsa", "ecdsa", "ed25519"]}, + "groupCreate +--group +\\S+ +--owner +\\S+ +--algo +\\S+" , {"ac" : ["--size"]}, + "groupCreate +--group +\\S+ +--owner +\\S+ +--algo +\\S+ +--size" , {"pr" : [""]}, + "groupCreate +--group +\\S+ +--owner +\\S+ +--algo +\\S+ +--size +\\d+" , {"ac" : ["", "--encrypted"]}, + "groupCreate +--group +\\S+ +--owner +\\S+ +--algo +\\S+ +--size +\\d+ +--encrypted" , {"pr" : [""]} ], "master_only": true, "terminal_mode": "raw" diff --git a/bin/plugin/restricted/groupDelete.json b/bin/plugin/restricted/groupDelete.json index dd3c28a9a..72d060591 100644 --- a/bin/plugin/restricted/groupDelete.json +++ b/bin/plugin/restricted/groupDelete.json @@ -1,8 +1,8 @@ { "interactive": [ - "groupDelete" , {"ac" : ["--group"]}, - "groupDelete --group" , {"ac" : [""]}, - "groupDelete --group \\S+" , {"pr" : ""} + "groupDelete" , {"ac" : ["--group"]}, + "groupDelete +--group" , {"ac" : [""]}, + "groupDelete +--group +\\S+" , {"pr" : ""} ], "master_only": true, "terminal_mode": "raw" diff --git a/bin/plugin/restricted/realmDelete.json b/bin/plugin/restricted/realmDelete.json index b11f1e631..261ae727e 100644 --- a/bin/plugin/restricted/realmDelete.json +++ b/bin/plugin/restricted/realmDelete.json @@ -1,8 +1,8 @@ { "interactive": [ - "realmDelete" , {"ac" : ["--realm"]}, - "realmDelete --realm" , {"ac" : [""]}, - "realmDelete --realm \\S+" , {"pr" : [""]} + "realmDelete" , {"ac" : ["--realm"]}, + "realmDelete +--realm" , {"ac" : [""]}, + "realmDelete +--realm +\\S+" , {"pr" : [""]} ], "master_only": true } diff --git a/bin/plugin/restricted/realmInfo.json b/bin/plugin/restricted/realmInfo.json index 1f2cd7956..994deb3e3 100644 --- a/bin/plugin/restricted/realmInfo.json +++ b/bin/plugin/restricted/realmInfo.json @@ -1,7 +1,7 @@ { "interactive": [ - "realmInfo" , {"ac" : ["--realm"]}, - "realmInfo --realm" , {"ac" : [""]}, - "realmInfo --realm \\S+" , {"pr" : [""]} + "realmInfo" , {"ac" : ["--realm"]}, + "realmInfo +--realm" , {"ac" : [""]}, + "realmInfo +--realm +\\S+" , {"pr" : [""]} ] } diff --git a/bin/plugin/restricted/selfAddPersonalAccess.json b/bin/plugin/restricted/selfAddPersonalAccess.json index 66753729a..47ecc48d2 100644 --- a/bin/plugin/restricted/selfAddPersonalAccess.json +++ b/bin/plugin/restricted/selfAddPersonalAccess.json @@ -1,23 +1,23 @@ { "interactive": [ - "selfAddPersonalAccess" , {"ac" : ["--host"]}, - "selfAddPersonalAccess --host" , {"pr" : ["", "", ""]}, - "selfAddPersonalAccess --host \\S+" , {"ac" : ["", "--user", "--port"]}, - "selfAddPersonalAccess --host \\S+ .*--user" , {"pr" : [""]}, - "selfAddPersonalAccess --host \\S+ .*--port" , {"pr" : [""]}, - "selfAddPersonalAccess --host \\S+ --user \\S+" , {"ac" : ["", "--port"]}, - "selfAddPersonalAccess --host \\S+ --port \\S+" , {"ac" : ["", "--user"]}, - "selfAddPersonalAccess --host \\S+ --(port|user) \\S+ --(port|user) \\S+" , {"ac" : ["--force-key","--force-password","--ttl",""]}, - "selfAddPersonalAccess --host \\S+ --(port|user) \\S+ --(port|user) \\S+ --ttl" , {"pr" : [""]}, - "selfAddPersonalAccess --host \\S+ --(port|user) \\S+ --(port|user) \\S+ --ttl \\S+" , {"ac" : ["--force-key","--force-password",""]}, - "selfAddPersonalAccess --host \\S+ --(port|user) \\S+ --(port|user) \\S+ --ttl \\S+ --force-key" , {"pr" : [""]}, - "selfAddPersonalAccess --host \\S+ --(port|user) \\S+ --(port|user) \\S+ --ttl \\S+ --force-password" , {"pr" : [""]}, - "selfAddPersonalAccess --host \\S+ --(port|user) \\S+ --(port|user) \\S+ --ttl \\S+ --force-(key|password) \\S+" , {"pr" : [""]}, - "selfAddPersonalAccess --host \\S+ --(port|user) \\S+ --(port|user) \\S+ --force-key" , {"pr" : [""]}, - "selfAddPersonalAccess --host \\S+ --(port|user) \\S+ --(port|user) \\S+ --force-password" , {"pr" : [""]}, - "selfAddPersonalAccess --host \\S+ --(port|user) \\S+ --(port|user) \\S+ --force-(key|password) \\S+" , {"ac" : ["--ttl",""]}, - "selfAddPersonalAccess --host \\S+ --(port|user) \\S+ --(port|user) \\S+ --force-(key|password) \\S+ --ttl" , {"pr" : [""]}, - "selfAddPersonalAccess --host \\S+ --(port|user) \\S+ --(port|user) \\S+ --force-(key|password) \\S+ --ttl \\S+" , {"ac" : [""]} + "selfAddPersonalAccess" , {"ac" : ["--host"]}, + "selfAddPersonalAccess +--host" , {"pr" : ["", "", ""]}, + "selfAddPersonalAccess +--host +\\S+" , {"ac" : ["", "--user", "--port"]}, + "selfAddPersonalAccess +--host +\\S+ +.*--user" , {"pr" : [""]}, + "selfAddPersonalAccess +--host +\\S+ +.*--port" , {"pr" : [""]}, + "selfAddPersonalAccess +--host +\\S+ +--user +\\S+" , {"ac" : ["", "--port"]}, + "selfAddPersonalAccess +--host +\\S+ +--port +\\S+" , {"ac" : ["", "--user"]}, + "selfAddPersonalAccess +--host +\\S+ +--(port|user) +\\S+ +--(port|user) +\\S+" , {"ac" : ["--force-key","--force-password","--ttl",""]}, + "selfAddPersonalAccess +--host +\\S+ +--(port|user) +\\S+ +--(port|user) +\\S+ +--ttl" , {"pr" : [""]}, + "selfAddPersonalAccess +--host +\\S+ +--(port|user) +\\S+ +--(port|user) +\\S+ +--ttl +\\S+" , {"ac" : ["--force-key","--force-password",""]}, + "selfAddPersonalAccess +--host +\\S+ +--(port|user) +\\S+ +--(port|user) +\\S+ +--ttl +\\S+ --force-key" , {"pr" : [""]}, + "selfAddPersonalAccess +--host +\\S+ +--(port|user) +\\S+ +--(port|user) +\\S+ +--ttl +\\S+ --force-password" , {"pr" : [""]}, + "selfAddPersonalAccess +--host +\\S+ +--(port|user) +\\S+ +--(port|user) +\\S+ +--ttl +\\S+ --force-(key|password) \\S+" , {"pr" : [""]}, + "selfAddPersonalAccess +--host +\\S+ +--(port|user) +\\S+ +--(port|user) +\\S+ +--force-key" , {"pr" : [""]}, + "selfAddPersonalAccess +--host +\\S+ +--(port|user) +\\S+ +--(port|user) +\\S+ +--force-password" , {"pr" : [""]}, + "selfAddPersonalAccess +--host +\\S+ +--(port|user) +\\S+ +--(port|user) +\\S+ +--force-(key|password) +\\S+" , {"ac" : ["--ttl",""]}, + "selfAddPersonalAccess +--host +\\S+ +--(port|user) +\\S+ +--(port|user) +\\S+ +--force-(key|password) +\\S+ +--ttl" , {"pr" : [""]}, + "selfAddPersonalAccess +--host +\\S+ +--(port|user) +\\S+ +--(port|user) +\\S+ +--force-(key|password) +\\S+ +--ttl +\\S+" , {"ac" : [""]} ], "master_only": true } diff --git a/bin/plugin/restricted/selfDelPersonalAccess.json b/bin/plugin/restricted/selfDelPersonalAccess.json index 6af8e8200..729bbf324 100644 --- a/bin/plugin/restricted/selfDelPersonalAccess.json +++ b/bin/plugin/restricted/selfDelPersonalAccess.json @@ -1,13 +1,13 @@ { "interactive": [ - "selfDelPersonalAccess" , {"ac" : ["--host"]}, - "selfDelPersonalAccess --host" , {"pr" : ["", "", ""]}, - "selfDelPersonalAccess --host \\S+" , {"ac" : ["", "--user", "--port"]}, - "selfDelPersonalAccess --host \\S+ .*--user" , {"pr" : [""]}, - "selfDelPersonalAccess --host \\S+ .*--port" , {"pr" : [""]}, - "selfDelPersonalAccess --host \\S+ --user \\S+" , {"ac" : ["", "--port"]}, - "selfDelPersonalAccess --host \\S+ --port \\S+" , {"ac" : ["", "--user"]}, - "selfDelPersonalAccess --host \\S+ --(port|user) \\S+ --(port|user) \\S+" , {"pr" : [""]} + "selfDelPersonalAccess" , {"ac" : ["--host"]}, + "selfDelPersonalAccess +--host" , {"pr" : ["", "", ""]}, + "selfDelPersonalAccess +--host +\\S+" , {"ac" : ["", "--user", "--port"]}, + "selfDelPersonalAccess +--host +\\S+ +.*--user" , {"pr" : [""]}, + "selfDelPersonalAccess +--host +\\S+ +.*--port" , {"pr" : [""]}, + "selfDelPersonalAccess +--host +\\S+ +--user +\\S+" , {"ac" : ["", "--port"]}, + "selfDelPersonalAccess +--host +\\S+ +--port +\\S+" , {"ac" : ["", "--user"]}, + "selfDelPersonalAccess +--host +\\S+ +--(port|user) +\\S+ +--(port|user) +\\S+" , {"pr" : [""]} ], "master_only": true } diff --git a/bin/plugin/restricted/whoHasAccessTo.json b/bin/plugin/restricted/whoHasAccessTo.json index b03fcaaaa..bca1a1f7b 100644 --- a/bin/plugin/restricted/whoHasAccessTo.json +++ b/bin/plugin/restricted/whoHasAccessTo.json @@ -1,10 +1,10 @@ { "interactive": [ - "whoHasAccessTo" , {"ac" : ["--host"]}, - "whoHasAccessTo --host" , {"pr" : [""]}, - "whoHasAccessTo --host \\S+ (.*--(user|port|ignore-group) \\S+| .*--(ignore-wildcard|ignore-private))?$" , {"ac" : ["--user","--port","--ignore-wildcard","--ignore-private","--ignore-group",""]}, - "whoHasAccessTo --host \\S+ .*--user" , {"pr" : [""]}, - "whoHasAccessTo --host \\S+ .*--port" , {"pr" : [""]}, - "whoHasAccessTo --host \\S+ .*--ignore-group" , {"ac" : [""]} + "whoHasAccessTo" , {"ac" : ["--host"]}, + "whoHasAccessTo +--host" , {"pr" : [""]}, + "whoHasAccessTo +--host +\\S+ +(.*--(user|port|ignore-group) +\\S+| +.*--(ignore-wildcard|ignore-private))?$" , {"ac" : ["--user","--port","--ignore-wildcard","--ignore-private","--ignore-group",""]}, + "whoHasAccessTo +--host +\\S+ +.*--user" , {"pr" : [""]}, + "whoHasAccessTo +--host +\\S+ +.*--port" , {"pr" : [""]}, + "whoHasAccessTo +--host +\\S+ +.*--ignore-group" , {"ac" : [""]} ] } diff --git a/lib/perl/OVH/Bastion/interactive.inc b/lib/perl/OVH/Bastion/interactive.inc index e13725753..f8ec12748 100644 --- a/lib/perl/OVH/Bastion/interactive.inc +++ b/lib/perl/OVH/Bastion/interactive.inc @@ -30,13 +30,6 @@ sub _get_prompt { return $prompt; } -sub _get_prompt_non_readline { - my %info = @_; - my $prompt_non_readline = _get_prompt(%info); - $prompt_non_readline =~ s=\001|\002==g; - return $prompt_non_readline; -} - sub interactive { my %params = @_; my $realOptions = $params{'realOptions'}; @@ -142,7 +135,8 @@ EOM my $groupList = OVH::Bastion::get_group_list(cache => 1, groupType => 'key')->value; my $realmList = OVH::Bastion::get_realm_list(cache => 1)->value; my $pluginListRestricted = OVH::Bastion::get_plugin_list(restrictedOnly => 1)->value; - foreach my $i (0 .. $#rules) { + my $i = 0; + while ($i + 1 < $#rules) { my $re = $rules[$i++]; my $item = $rules[$i++]; @@ -189,7 +183,7 @@ EOM if ($item->{'pr'}) { print "\n" . join("\n", @{$item->{'pr'}}) . "\n" - . _get_prompt_non_readline($self, $bastionName, $slaveOrMaster) + . _get_prompt($self, $bastionName, $slaveOrMaster) . $line; return (); }