Skip to content

Commit 5bf5945

Browse files
0x6675636b796f756769746875620x6675636b796f75676974687562
authored
Merge branch 'master' into feature/test-suite-validation
2 parents 30af688 + 88868be commit 5bf5945

File tree

29 files changed

+370
-189
lines changed

29 files changed

+370
-189
lines changed

‎.github/workflows/build_and_test.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
with:
4141
path: ~/.konan
4242
key: ${{ runner.os }}-gradle-konan-${{ env.KOTLIN_VERSION }}
43-
- name: Build all (excluding tests for save-orchestrator-common)
43+
- name: Build all (excluding save-orchestrator-common, save-orchestrator and save-sandbox)
4444
uses: gradle/gradle-build-action@v2
4545
with:
4646
gradle-version: wrapper
@@ -50,19 +50,23 @@ jobs:
5050
-x detekt
5151
-x spotlessCheck
5252
-x :save-agent:linkDebugExecutableLinuxX64
53-
-x :save-orchestrator-common:check
53+
-x :save-orchestrator-common:build
54+
-x :save-orchestrator:build
55+
-x :save-sandbox:build
5456
-Pdetekt.multiplatform.disabled=true
5557
-PgprUser=${{ github.actor }}
5658
-PgprKey=${{ secrets.GITHUB_TOKEN }}
5759
--scan
5860
--build-cache
59-
- name: Check save-orchestrator-common
61+
- name: Build save-orchestrator-common, save-orchestrator and save-sandbox
6062
uses: gradle/gradle-build-action@v2
6163
with:
6264
gradle-version: wrapper
6365
gradle-home-cache-cleanup: true
6466
arguments: |
65-
:save-orchestrator-common:check
67+
:save-orchestrator-common:build
68+
:save-orchestrator:build
69+
:save-sandbox:build
6670
-x detekt
6771
-x spotlessCheck
6872
-x :save-agent:linkDebugExecutableLinuxX64

‎build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import com.saveourtool.save.buildutils.*
33
@Suppress("DSL_SCOPE_VIOLATION", "RUN_IN_SCRIPT") // https://github.com/gradle/gradle/issues/22797
44
plugins {
55
id("com.saveourtool.save.buildutils.versioning-configuration")
6+
id("com.saveourtool.save.buildutils.save-cli-download-configuration")
67
id("com.saveourtool.save.buildutils.code-quality-convention")
78
id("com.saveourtool.save.buildutils.publishing-configuration")
89
alias(libs.plugins.talaiot.base)

‎db/test-data/db.changelog-insert.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
<include file="file-insert.xml" relativeToChangelogFile="true"/>
3131
<include file="lnk-execution-file-insert.xml" relativeToChangelogFile="true"/>
3232
<include file="tests-source-version-insert.xml" relativeToChangelogFile="true"/>
33+
<include file="vulnerability-insert.xml" relativeToChangelogFile="true"/>
34+
<include file="vulnerability-description-insert.xml" relativeToChangelogFile="true"/>
35+
<include file="vulnerability-project-insert.xml" relativeToChangelogFile="true"/>
3336

3437
<changeSet id="add-tests-data" author="nulls">
3538
<tagDatabase tag="test-data-insert"/>

‎db/test-data/sqlRequests/vulnerability-description.csv‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
id;description;vulnerability_id
2+
1;"In Spring Security versions 5.5.6 and 5.6.3 and older unsupported versions, RegexRequestMatcher can easily be misconfigured to be bypassed on some servlet containers. Applications using RegexRequestMatcher with `.` in the regular expression are possibly vulnerable to an authorization bypass";1

‎db/test-data/sqlRequests/vulnerability-project.csv‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
id;name;url;is_open_source;vulnerability_id
2+
1;"spring-projects/spring-security";"https://github.com/spring-projects/spring-security";1;1
3+
2;"org.springframework.security:spring-security-web";"https://mvnrepository.com/artifact/org.springframework.security/spring-security-web";0;1
4+
3;"org.springframework.security:spring-security-core";"https://mvnrepository.com/artifact/org.springframework.security/spring-security-core";0;1

‎db/test-data/vulnerability-description-insert.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
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
6+
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd">
7+
8+
<changeSet id="vulnerability-description-insert" author="frolov" context="dev">
9+
<loadData tableName="vulnerability_description" encoding="UTF-8" separator=";" quotchar="&quot;" file="db/test-data/sqlRequests/vulnerability-description.csv">
10+
<column header="id" name="id" type="bigint"/>
11+
<column header="vulnerability_id" name="vulnerability_id" type="bigint"/>
12+
<column header="description" name="description" type="TEXT"/>
13+
</loadData>
14+
</changeSet>
15+
16+
</databaseChangeLog>

‎db/test-data/vulnerability-project-insert.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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
6+
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd">
7+
8+
<changeSet id="vulnerability-project-insert" author="frolov" context="dev">
9+
<loadData tableName="vulnerability_project" encoding="UTF-8" separator=";" quotchar="&quot;" file="db/test-data/sqlRequests/vulnerability-project.csv">
10+
<column header="id" name="id" type="bigint"/>
11+
<column header="name" name="name" type="varchar(250)"/>
12+
<column header="url" name="url" type="varchar(250)"/>
13+
<column header="is_open_source" name="is_open_source" type="BOOLEAN"/>
14+
<column header="vulnerability_id" name="vulnerability_id" type="bigint"/>
15+
</loadData>
16+
</changeSet>
17+
18+
</databaseChangeLog>

‎db/v-2/tables/db.changelog-tables.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
<include file="lnk-execution-file.xml" relativeToChangelogFile="true"/>
3636
<include file="tests-source-snapshot.xml" relativeToChangelogFile="true"/>
3737
<include file="tests-source-version.xml" relativeToChangelogFile="true"/>
38+
<include file="vulnerability.xml" relativeToChangelogFile="true"/>
39+
<include file="vulnerability-description.xml" relativeToChangelogFile="true"/>
40+
<include file="vulnerability-project.xml" relativeToChangelogFile="true"/>
3841

3942
<changeSet id="02-tables" author="frolov">
4043
<tagDatabase tag="v2.0-tables"/>

‎db/v-2/tables/vulnerability-description.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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
6+
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd">
7+
8+
<changeSet id="vulnerability-description-1" author="frolov" context="dev or prod">
9+
<createTable tableName="vulnerability_description">
10+
<column name="id" type="bigint" autoIncrement="true">
11+
<constraints primaryKey="true" nullable="false"/>
12+
</column>
13+
<column name="vulnerability_id" type="bigint">
14+
<constraints foreignKeyName="fk_vulnerability_description_vulnerability" references="vulnerability(id)" nullable="false" deleteCascade="true"/>
15+
</column>
16+
<column name="description" type="TEXT">
17+
<constraints nullable="false"/>
18+
</column>
19+
</createTable>
20+
</changeSet>
21+
22+
</databaseChangeLog>

‎db/v-2/tables/vulnerability-project.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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
6+
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd">
7+
8+
<changeSet id="vulnerability-project-1" author="frolov" context="dev or prod">
9+
<createTable tableName="vulnerability_project">
10+
<column name="id" type="bigint" autoIncrement="true">
11+
<constraints primaryKey="true" nullable="false"/>
12+
</column>
13+
<column name="name" type="varchar(250)">
14+
<constraints nullable="false"/>
15+
</column>
16+
<column name="url" type="varchar(250)"/>
17+
<column name="is_open_source" type="BOOLEAN" defaultValue="0"/>
18+
<column name="vulnerability_id" type="bigint">
19+
<constraints foreignKeyName="fk_vulnerability_project_vulnerability" references="vulnerability(id)" nullable="false" deleteCascade="true"/>
20+
</column>
21+
</createTable>
22+
</changeSet>
23+
24+
</databaseChangeLog>

0 commit comments

Comments
 (0)