Skip to content

Commit 7ac1651

Browse files
author
Diego Nadares
committed
Merge branch 'white/staging' into white/master
2 parents 36166e9 + 158715a commit 7ac1651

File tree

19 files changed

+963
-676
lines changed

19 files changed

+963
-676
lines changed

‎.gitlab/ci/testing/.pretesting-gitlab-ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ bandit:
5454
- mkdir /results
5555
- "bandit -r ${CI_PROJECT_DIR}/faraday -o /results/output.xml -f xml --skip B101"
5656
after_script:
57-
- curl -fsSL https://apt.releases.hashicorp.com/gpg | apt-key add -
57+
- wget -O- https://apt.releases.hashicorp.com/gpg | gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg
5858
- apt update
5959
- apt-get install software-properties-common -y
60-
- apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com focal main"
60+
- echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/hashicorp.list
6161
- apt update
6262
- apt install vault -y
6363
- setcap cap_ipc_lock= /usr/bin/vault

‎CHANGELOG/4.6.0/community.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* [FIX] Delete Cascade from KB. #7569

‎CHANGELOG/4.6.0/date.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Sep 6th, 2023

‎RELEASE.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
New features in the latest update
22
=====================================
33

4+
4.6.0 [Sep 6th, 2023]:
5+
---
6+
* [FIX] Delete Cascade from KB. #7569
7+
48
4.5.1 [Jul 15th, 2023]:
59
---
610
* [FIX] Fix pillow version to 9.4.0. #7531

‎faraday/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
See the file 'doc/LICENSE' for the license information
55
"""
66

7-
__version__ = '4.5.1'
7+
__version__ = '4.6.0'
88
__license_version__ = __version__

‎faraday/migrations/versions/61ded0c8fbf6_notification_center.py‎

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
"""notification center
2+
3+
Revision ID: 61ded0c8fbf6
4+
Revises: f20aa8756612
5+
Create Date: 2023-01-11 19:24:20.511853+00:00
6+
7+
"""
8+
from alembic import op
9+
import sqlalchemy as sa
10+
11+
import faraday
12+
13+
# revision identifiers, used by Alembic.
14+
revision = '61ded0c8fbf6'
15+
down_revision = 'dd3181b9b3e9'
16+
branch_labels = None
17+
depends_on = None
18+
19+
20+
def upgrade():
21+
# ### commands auto generated by Alembic - please adjust! ###
22+
op.create_table('base_notification',
23+
sa.Column('create_date', sa.DateTime(), nullable=True),
24+
sa.Column('update_date', sa.DateTime(), nullable=True),
25+
sa.Column('id', sa.Integer(), nullable=False),
26+
sa.Column('data', faraday.server.fields.JSONType(), nullable=False),
27+
sa.Column('processed', sa.Boolean(), nullable=True),
28+
sa.Column('creator_id', sa.Integer(), nullable=True),
29+
sa.Column('update_user_id', sa.Integer(), nullable=True),
30+
sa.Column('verbose', sa.Boolean(), nullable=False),
31+
sa.ForeignKeyConstraint(['creator_id'], ['faraday_user.id'], ondelete='SET NULL'),
32+
sa.ForeignKeyConstraint(['update_user_id'], ['faraday_user.id'], ondelete='SET NULL'),
33+
sa.PrimaryKeyConstraint('id')
34+
)
35+
op.create_table('user_notification',
36+
sa.Column('create_date', sa.DateTime(), nullable=True),
37+
sa.Column('update_date', sa.DateTime(), nullable=True),
38+
sa.Column('id', sa.Integer(), nullable=False),
39+
sa.Column('message', sa.Text(), nullable=False),
40+
sa.Column('extra_data', faraday.server.fields.JSONType(), nullable=True),
41+
sa.Column('type', sa.String(), nullable=False),
42+
sa.Column('subtype', sa.String(), nullable=False),
43+
sa.Column('read', sa.Boolean(), nullable=True),
44+
sa.Column('user_id', sa.Integer(), nullable=False),
45+
sa.Column('creator_id', sa.Integer(), nullable=True),
46+
sa.Column('update_user_id', sa.Integer(), nullable=True),
47+
sa.Column('triggered_by', faraday.server.fields.JSONType(), nullable=False),
48+
sa.Column('links_to', faraday.server.fields.JSONType(), nullable=True),
49+
sa.Column('event_date', sa.DateTime(), nullable=False),
50+
sa.ForeignKeyConstraint(['creator_id'], ['faraday_user.id'], ondelete='SET NULL'),
51+
sa.ForeignKeyConstraint(['update_user_id'], ['faraday_user.id'], ondelete='SET NULL'),
52+
sa.ForeignKeyConstraint(['user_id'], ['faraday_user.id'], ),
53+
sa.PrimaryKeyConstraint('id')
54+
)
55+
op.create_index(op.f('ix_user_notification_user_id'), 'user_notification', ['user_id'], unique=False)
56+
op.create_table('user_notification_settings',
57+
sa.Column('create_date', sa.DateTime(), nullable=True),
58+
sa.Column('update_date', sa.DateTime(), nullable=True),
59+
sa.Column('id', sa.Integer(), nullable=False),
60+
sa.Column('user_id', sa.Integer(), nullable=False),
61+
sa.Column('paused', sa.Boolean(), nullable=False),
62+
sa.Column('slack_id', sa.String(), nullable=True),
63+
sa.Column('no_self_notify', sa.Boolean(), nullable=False),
64+
sa.Column('agents_enabled', sa.Boolean(), nullable=False),
65+
sa.Column('agents_app', sa.Boolean(), nullable=False),
66+
sa.Column('agents_email', sa.Boolean(), nullable=False),
67+
sa.Column('agents_slack', sa.Boolean(), nullable=False),
68+
sa.Column('cli_enabled', sa.Boolean(), nullable=False),
69+
sa.Column('cli_app', sa.Boolean(), nullable=False),
70+
sa.Column('cli_email', sa.Boolean(), nullable=False),
71+
sa.Column('cli_slack', sa.Boolean(), nullable=False),
72+
sa.Column('comments_enabled', sa.Boolean(), nullable=False),
73+
sa.Column('comments_app', sa.Boolean(), nullable=False),
74+
sa.Column('comments_email', sa.Boolean(), nullable=False),
75+
sa.Column('comments_slack', sa.Boolean(), nullable=False),
76+
sa.Column('hosts_enabled', sa.Boolean(), nullable=False),
77+
sa.Column('hosts_app', sa.Boolean(), nullable=False),
78+
sa.Column('hosts_email', sa.Boolean(), nullable=False),
79+
sa.Column('hosts_slack', sa.Boolean(), nullable=False),
80+
sa.Column('users_enabled', sa.Boolean(), nullable=False),
81+
sa.Column('users_app', sa.Boolean(), nullable=False),
82+
sa.Column('users_email', sa.Boolean(), nullable=False),
83+
sa.Column('users_slack', sa.Boolean(), nullable=False),
84+
sa.Column('reports_enabled', sa.Boolean(), nullable=False),
85+
sa.Column('reports_app', sa.Boolean(), nullable=False),
86+
sa.Column('reports_email', sa.Boolean(), nullable=False),
87+
sa.Column('reports_slack', sa.Boolean(), nullable=False),
88+
sa.Column('vulnerabilities_enabled', sa.Boolean(), nullable=False),
89+
sa.Column('vulnerabilities_app', sa.Boolean(), nullable=False),
90+
sa.Column('vulnerabilities_email', sa.Boolean(), nullable=False),
91+
sa.Column('vulnerabilities_slack', sa.Boolean(), nullable=False),
92+
sa.Column('workspaces_enabled', sa.Boolean(), nullable=False),
93+
sa.Column('workspaces_app', sa.Boolean(), nullable=False),
94+
sa.Column('workspaces_email', sa.Boolean(), nullable=False),
95+
sa.Column('workspaces_slack', sa.Boolean(), nullable=False),
96+
sa.Column('pipelines_enabled', sa.Boolean(), nullable=False),
97+
sa.Column('pipelines_app', sa.Boolean(), nullable=False),
98+
sa.Column('pipelines_email', sa.Boolean(), nullable=False),
99+
sa.Column('pipelines_slack', sa.Boolean(), nullable=False),
100+
sa.Column('executive_reports_enabled', sa.Boolean(), nullable=False),
101+
sa.Column('executive_reports_app', sa.Boolean(), nullable=False),
102+
sa.Column('executive_reports_email', sa.Boolean(), nullable=False),
103+
sa.Column('executive_reports_slack', sa.Boolean(), nullable=False),
104+
sa.Column('planner_enabled', sa.Boolean(), nullable=False),
105+
sa.Column('planner_app', sa.Boolean(), nullable=False),
106+
sa.Column('planner_email', sa.Boolean(), nullable=False),
107+
sa.Column('planner_slack', sa.Boolean(), nullable=False),
108+
sa.Column('integrations_enabled', sa.Boolean(), nullable=False),
109+
sa.Column('integrations_app', sa.Boolean(), nullable=False),
110+
sa.Column('integrations_email', sa.Boolean(), nullable=False),
111+
sa.Column('integrations_slack', sa.Boolean(), nullable=False),
112+
sa.Column('other_enabled', sa.Boolean(), nullable=False),
113+
sa.Column('other_app', sa.Boolean(), nullable=False),
114+
sa.Column('other_email', sa.Boolean(), nullable=False),
115+
sa.Column('other_slack', sa.Boolean(), nullable=False),
116+
sa.Column('adv_high_crit_vuln', sa.Boolean(), nullable=False),
117+
sa.Column('adv_risk_score_threshold', sa.Integer(), nullable=False),
118+
sa.Column('adv_vuln_open_days', sa.Integer(), nullable=False),
119+
sa.Column('creator_id', sa.Integer(), nullable=True),
120+
sa.Column('update_user_id', sa.Integer(), nullable=True),
121+
sa.ForeignKeyConstraint(['creator_id'], ['faraday_user.id'], ondelete='SET NULL'),
122+
sa.ForeignKeyConstraint(['update_user_id'], ['faraday_user.id'], ondelete='SET NULL'),
123+
sa.ForeignKeyConstraint(['user_id'], ['faraday_user.id'], ),
124+
sa.PrimaryKeyConstraint('id')
125+
)
126+
# ### end Alembic commands ###
127+
128+
129+
def downgrade():
130+
# ### commands auto generated by Alembic - please adjust! ###
131+
op.drop_table('user_notification_settings')
132+
op.drop_index(op.f('ix_user_notification_user_id'), table_name='user_notification')
133+
op.drop_table('user_notification')
134+
op.drop_table('base_notification')
135+
# ### end Alembic commands ###

‎faraday/migrations/versions/73854f804a8d_cascade_kb_2.py‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
"""cascade KB 2
2+
3+
Revision ID: 73854f804a8d
4+
Revises: 61ded0c8fbf6
5+
Create Date: 2023-08-31 17:16:51.813227+00:00
6+
7+
"""
8+
from alembic import op
9+
10+
11+
# revision identifiers, used by Alembic.
12+
revision = '73854f804a8d'
13+
down_revision = '61ded0c8fbf6'
14+
branch_labels = None
15+
depends_on = None
16+
17+
18+
def upgrade():
19+
op.execute('ALTER TABLE policy_violation_template_vulnerability_association DROP CONSTRAINT policy_violation_template_vulnerability_a_vulnerability_id_fkey')
20+
op.execute('ALTER TABLE policy_violation_template_vulnerability_association ADD CONSTRAINT policy_violation_template_vulnerability_a_vulnerability_id_fkey FOREIGN KEY (vulnerability_id) REFERENCES vulnerability_template (id) ON DELETE CASCADE')
21+
22+
op.execute('ALTER TABLE reference_template_vulnerability_association DROP CONSTRAINT reference_template_vulnerability_associat_vulnerability_id_fkey')
23+
op.execute('ALTER TABLE reference_template_vulnerability_association ADD CONSTRAINT reference_template_vulnerability_associat_vulnerability_id_fkey FOREIGN KEY (vulnerability_id) REFERENCES vulnerability_template (id) ON DELETE CASCADE')
24+
25+
26+
def downgrade():
27+
op.execute('ALTER TABLE policy_violation_template_vulnerability_association DROP CONSTRAINT policy_violation_template_vulnerability_a_vulnerability_id_fkey')
28+
op.execute('ALTER TABLE policy_violation_template_vulnerability_association ADD CONSTRAINT policy_violation_template_vulnerability_a_vulnerability_id_fkey FOREIGN KEY (vulnerability_id) REFERENCES vulnerability_template (id)')
29+
30+
op.execute('ALTER TABLE reference_template_vulnerability_association DROP CONSTRAINT reference_template_vulnerability_associat_vulnerability_id_fkey')
31+
op.execute('ALTER TABLE reference_template_vulnerability_association ADD CONSTRAINT reference_template_vulnerability_associat_vulnerability_id_fkey FOREIGN KEY (vulnerability_id) REFERENCES vulnerability_template (id)')

0 commit comments

Comments
 (0)