Skip to content

Commit

Permalink
Merge branch 'CactuseSecurity:develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@NilsPur
NilsPur authored Aug 31, 2023
2 parents 5078ace + 2acf6ff commit 38b6c11
Show file tree
Hide file tree
Showing 17 changed files with 707 additions and 254 deletions.
14 changes: 14 additions & 0 deletions documentation/revision-history-develop.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,17 @@ In 2020 we decided to re-launch a new

### 7.1.2 - 16.08.2023 DEVELOP
- adding Check Point R8x Inform action

### 7.2 - 21.08.2023 DEVELOP
mostly version update summarizing latest PRs
- UI/API: adding tenant ip filtering beta version (clean-up and optiomazation necessary)
- API: updating hasura to 2.32.0
- UI: now not showing super managers in RSB all tab
- UI: bug fixes blazor environment settings
- Use production / development based on the build type instead of always using development.
- Do not show detailed errors in production mode.
- Use the custom error page in the production environment.
- Spelling mistake fix
- UI: bug fix jwt expiry
- jwt expiry timer now works as intended
- after the jwt expired no exception can be triggered anymore
2 changes: 1 addition & 1 deletion inventory/group_vars/all.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### general settings
product_version: "7.1.2"
product_version: "7.2"
ansible_user: "{{ lookup('env', 'USER') }}"
ansible_become_method: sudo
ansible_python_interpreter: /usr/bin/python3
Expand Down
2 changes: 1 addition & 1 deletion inventory/group_vars/apiserver.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ api_hasura_admin_test_password: "not4production"
api_user_email: "{{ api_user }}@{{ api_network_listening_ip_address }}"
api_home: "{{ fworch_home }}/api"
api_hasura_cli_bin: "{{ fworch_home }}/api/bin/hasura"
api_hasura_version: "v2.31.0"
api_hasura_version: "v2.32.0"
api_project_name: api
api_no_metadata: false
api_rollback_is_running: false
Expand Down
242 changes: 226 additions & 16 deletions roles/api/files/replace_metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1627,6 +1627,18 @@
}
}
],
"computed_fields": [
{
"name": "has_relevant_change",
"definition": {
"function": {
"name": "has_relevant_change",
"schema": "public"
},
"session_argument": "hasura_session"
}
}
],
"select_permissions": [
{
"role": "auditor",
Expand Down Expand Up @@ -1735,10 +1747,27 @@
"change_time",
"unique_name"
],
"computed_fields": [
"has_relevant_change"
],
"filter": {
"dev_id": {
"_in": "x-hasura-visible-devices"
}
"_and": [
{
"mgm_id": {
"_in": "x-hasura-visible-managements"
}
},
{
"dev_id": {
"_in": "x-hasura-visible-devices"
}
},
{
"has_relevant_change": {
"_eq": "true"
}
}
]
},
"allow_aggregations": true
}
Expand Down Expand Up @@ -1767,10 +1796,27 @@
"change_time",
"unique_name"
],
"computed_fields": [
"has_relevant_change"
],
"filter": {
"dev_id": {
"_in": "x-hasura-visible-devices"
}
"_and": [
{
"mgm_id": {
"_in": "x-hasura-visible-managements"
}
},
{
"dev_id": {
"_in": "x-hasura-visible-devices"
}
},
{
"has_relevant_change": {
"_eq": "true"
}
}
]
},
"allow_aggregations": true
}
Expand Down Expand Up @@ -6861,6 +6907,18 @@
}
}
],
"computed_fields": [
{
"name": "object_relevant_for_tenant",
"definition": {
"function": {
"name": "object_relevant_for_tenant",
"schema": "public"
},
"session_argument": "hasura_session"
}
}
],
"select_permissions": [
{
"role": "auditor",
Expand Down Expand Up @@ -6976,9 +7034,18 @@
"obj_last_seen"
],
"filter": {
"mgm_id": {
"_in": "x-hasura-visible-managements"
}
"_and": [
{
"mgm_id": {
"_in": "x-hasura-visible-managements"
}
},
{
"object_relevant_for_tenant": {
"_eq": "true"
}
}
]
},
"allow_aggregations": true
}
Expand Down Expand Up @@ -7019,9 +7086,18 @@
"obj_last_seen"
],
"filter": {
"mgm_id": {
"_in": "x-hasura-visible-managements"
}
"_and": [
{
"mgm_id": {
"_in": "x-hasura-visible-managements"
}
},
{
"object_relevant_for_tenant": {
"_eq": "true"
}
}
]
},
"allow_aggregations": true
}
Expand Down Expand Up @@ -10027,6 +10103,18 @@
}
}
],
"computed_fields": [
{
"name": "rule_relevant_for_tenant",
"definition": {
"function": {
"name": "rule_relevant_for_tenant",
"schema": "public"
},
"session_argument": "hasura_session"
}
}
],
"select_permissions": [
{
"role": "auditor",
Expand Down Expand Up @@ -10186,6 +10274,11 @@
"dev_id": {
"_in": "x-hasura-visible-devices"
}
},
{
"rule_relevant_for_tenant": {
"_eq": "true"
}
}
]
},
Expand Down Expand Up @@ -10246,6 +10339,11 @@
"dev_id": {
"_in": "x-hasura-visible-devices"
}
},
{
"rule_relevant_for_tenant": {
"_eq": "true"
}
}
]
},
Expand Down Expand Up @@ -10338,6 +10436,18 @@
}
}
],
"computed_fields": [
{
"name": "rule_from_relevant_for_tenant",
"definition": {
"function": {
"name": "rule_from_relevant_for_tenant",
"schema": "public"
},
"session_argument": "hasura_session"
}
}
],
"select_permissions": [
{
"role": "auditor",
Expand Down Expand Up @@ -10386,7 +10496,29 @@
"active",
"negated"
],
"filter": {},
"filter": {
"_and": [
{
"rule": {
"mgm_id": {
"_in": "x-hasura-visible-managements"
}
}
},
{
"rule": {
"dev_id": {
"_in": "x-hasura-visible-devices"
}
}
},
{
"rule_from_relevant_for_tenant": {
"_eq": "true"
}
}
]
},
"allow_aggregations": true
}
},
Expand All @@ -10403,7 +10535,29 @@
"active",
"negated"
],
"filter": {},
"filter": {
"_and": [
{
"rule": {
"mgm_id": {
"_in": "x-hasura-visible-managements"
}
}
},
{
"rule": {
"dev_id": {
"_in": "x-hasura-visible-devices"
}
}
},
{
"rule_from_relevant_for_tenant": {
"_eq": "true"
}
}
]
},
"allow_aggregations": true
}
},
Expand Down Expand Up @@ -11144,6 +11298,18 @@
}
}
],
"computed_fields": [
{
"name": "rule_to_relevant_for_tenant",
"definition": {
"function": {
"name": "rule_to_relevant_for_tenant",
"schema": "public"
},
"session_argument": "hasura_session"
}
}
],
"select_permissions": [
{
"role": "auditor",
Expand Down Expand Up @@ -11190,7 +11356,29 @@
"rule_to_id",
"user_id"
],
"filter": {},
"filter": {
"_and": [
{
"rule": {
"mgm_id": {
"_in": "x-hasura-visible-managements"
}
}
},
{
"rule": {
"dev_id": {
"_in": "x-hasura-visible-devices"
}
}
},
{
"rule_to_relevant_for_tenant": {
"_eq": "true"
}
}
]
},
"allow_aggregations": true
}
},
Expand All @@ -11207,7 +11395,29 @@
"rule_to_id",
"user_id"
],
"filter": {},
"filter": {
"_and": [
{
"rule": {
"mgm_id": {
"_in": "x-hasura-visible-managements"
}
}
},
{
"rule": {
"dev_id": {
"_in": "x-hasura-visible-devices"
}
}
},
{
"rule_to_relevant_for_tenant": {
"_eq": "true"
}
}
]
},
"allow_aggregations": true
}
},
Expand Down
Loading

0 comments on commit 38b6c11

Please sign in to comment.