Skip to content

Commit a8a85fd

Browse files
committed
Merge remote-tracking branch 'origin/release/v11.2.2' into release/v11.2.2
2 parents 933237d + e760962 commit a8a85fd

File tree

12 files changed

+1769
-592
lines changed

12 files changed

+1769
-592
lines changed
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<databaseChangeLog
3+
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
6+
7+
<changeSet id="20260128001" author="Manuel Abascal">
8+
9+
<sql dbms="postgresql" splitStatements="true" stripComments="true">
10+
<![CDATA[
11+
DELETE FROM utm_correlation_rules
12+
WHERE id IN (
13+
SELECT u.id
14+
FROM utm_correlation_rules u
15+
INNER JOIN utm_group_rules_data_type ugrdt ON u.id = ugrdt.rule_id
16+
INNER JOIN utm_data_types udt ON udt.id = ugrdt.data_type_id
17+
WHERE udt.data_type IN ('azure')
18+
);
19+
]]>
20+
</sql>
21+
22+
<sqlFile
23+
path="config/liquibase/data/azure.rules.sql"
24+
relativeToChangelogFile="false"
25+
splitStatements="false"
26+
stripComments="false"
27+
encoding="UTF-8"/>
28+
29+
</changeSet>
30+
31+
</databaseChangeLog>
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<databaseChangeLog
3+
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
6+
7+
<changeSet id="20260128002" author="Manuel Abascal">
8+
9+
<sql dbms="postgresql" splitStatements="true" stripComments="true">
10+
<![CDATA[
11+
DELETE FROM utm_correlation_rules
12+
WHERE id IN (
13+
SELECT u.id
14+
FROM utm_correlation_rules u
15+
INNER JOIN utm_group_rules_data_type ugrdt ON u.id = ugrdt.rule_id
16+
INNER JOIN utm_data_types udt ON udt.id = ugrdt.data_type_id
17+
WHERE udt.data_type IN ('o365')
18+
);
19+
]]>
20+
</sql>
21+
22+
<sqlFile
23+
path="config/liquibase/data/o365.rules.sql"
24+
relativeToChangelogFile="false"
25+
splitStatements="false"
26+
stripComments="false"
27+
encoding="UTF-8"/>
28+
29+
</changeSet>
30+
31+
</databaseChangeLog>

backend/src/main/resources/config/liquibase/data/azure.rules.sql

Lines changed: 1220 additions & 0 deletions
Large diffs are not rendered by default.

backend/src/main/resources/config/liquibase/data/o365.rules.sql

Lines changed: 478 additions & 0 deletions
Large diffs are not rendered by default.

backend/src/main/resources/config/liquibase/master.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,4 +321,10 @@
321321

322322
<include file="/config/liquibase/changelog/20260126001_update_regex_for_configuration_parameter_base_url.xml" relativeToChangelogFile="false"/>
323323

324+
<include file="/config/liquibase/changelog/20260128001_update_azure_correlation_rules.xml" relativeToChangelogFile="false"/>
325+
326+
<include file="/config/liquibase/changelog/20260128002_update_o365_correlation_rules.xml" relativeToChangelogFile="false"/>
327+
328+
329+
324330
</databaseChangeLog>

etc/scripts/Pipfile

Lines changed: 0 additions & 18 deletions
This file was deleted.

etc/scripts/Pipfile.lock

Lines changed: 0 additions & 456 deletions
This file was deleted.

etc/scripts/README.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

etc/scripts/brute_force_office365.py

Lines changed: 0 additions & 39 deletions
This file was deleted.

etc/scripts/brute_force_ssh.py

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)