diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9155ac05de869f541bc4d42db9a8aa56723a5504..af7db7e4f982ad5b421ec421c68d27efa48a154b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,14 +68,15 @@ test-and-sonarqube:
- ./gradlew :backend:test --parallel
- find /tmp/node/*/bin -name node -exec ln -s {} /tmp/node/node \;
- export PATH="/tmp/node/:$PATH"
- - ./gradlew sonarqube -x test $SONAR_BRANCH_OPTS
+ - ./gradlew -s sonarqube -x test $SONAR_BRANCH_OPTS
artifacts:
reports:
junit:
- ./backend/build/test-results/test/TEST-*.xml
- ./frontend/karma-junit-tests-report/TEST*.xml
only:
- - merge_requests
+ refs:
+ - merge_requests
test-and-sonarqube-master:
diff --git a/.secrets.baseline b/.secrets.baseline
index 41a7ef088e1359fff04c2bf6e985920a1333708b..d3ef77762f5b265ef889ac52eb82c0c51f4bb108 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -3,7 +3,7 @@
"files": "frontend/package-lock.json|^.secrets.baseline$",
"lines": null
},
- "generated_at": "2020-11-23T11:10:06Z",
+ "generated_at": "2020-11-30T10:19:27Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
@@ -47,18 +47,25 @@
],
"results": {
".gitlab-ci.yml": [
+ {
+ "hashed_secret": "2907dcd1b70a82032e52be9b6b804abbb4a7525e",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 83,
+ "type": "Base64 High Entropy String"
+ },
{
"hashed_secret": "dd447c7c799dd4ebaacca8f0ad3da45a097d7211",
"is_secret": false,
"is_verified": false,
- "line_number": 160,
+ "line_number": 174,
"type": "Base64 High Entropy String"
},
{
"hashed_secret": "8074db38f8a8acec1a147bc5daf2799ff6693fff",
"is_secret": false,
"is_verified": false,
- "line_number": 175,
+ "line_number": 189,
"type": "Base64 High Entropy String"
}
],
@@ -71,6 +78,15 @@
"type": "Base64 High Entropy String"
}
],
+ ".idea/misc.xml": [
+ {
+ "hashed_secret": "a7174bf8908cdbd4fb5c32aa36b487ac0a6f1160",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 3,
+ "type": "Base64 High Entropy String"
+ }
+ ],
".idea/modules.xml": [
{
"hashed_secret": "e214f6735f68ae8b517a0fb7ea1bcf5999a96cb3",
@@ -103,21 +119,21 @@
"hashed_secret": "a8cc3e6575cfcb001213d2d4a539446e338c99f3",
"is_secret": false,
"is_verified": false,
- "line_number": 30,
+ "line_number": 32,
"type": "Base64 High Entropy String"
},
{
"hashed_secret": "72f190d7abc405337b349f4d86ce350c5e4527e0",
"is_secret": false,
"is_verified": false,
- "line_number": 61,
+ "line_number": 63,
"type": "Base64 High Entropy String"
},
{
"hashed_secret": "30193f9b586d5e62e446374763cc61f7e9cea0cd",
"is_secret": false,
"is_verified": false,
- "line_number": 64,
+ "line_number": 66,
"type": "Base64 High Entropy String"
}
],
@@ -205,6 +221,13 @@
"is_verified": false,
"line_number": 28,
"type": "Base64 High Entropy String"
+ },
+ {
+ "hashed_secret": "91166050949814b7f312b785b4c8b6417134b547",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 105,
+ "type": "Base64 High Entropy String"
}
],
"backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/XRefDocumentController.java": [
@@ -234,6 +257,29 @@
"type": "Base64 High Entropy String"
}
],
+ "backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/FaidareGermplasmPOSTShearchCriteria.java": [
+ {
+ "hashed_secret": "084c833a01fb1d770f994aaec6a07f282e41827a",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 44,
+ "type": "Base64 High Entropy String"
+ },
+ {
+ "hashed_secret": "ce74e278f4bd61efdd35fcdce522284654db7762",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 59,
+ "type": "Base64 High Entropy String"
+ },
+ {
+ "hashed_secret": "a577a4f5f8dab94eff3f257aec15319f14a8037a",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 65,
+ "type": "Base64 High Entropy String"
+ }
+ ],
"backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/GermplasmAttributeCriteria.java": [
{
"hashed_secret": "344a627efbdf17dfc804f04e2eb1626843c0e825",
@@ -375,12 +421,28 @@
"type": "Base64 High Entropy String"
}
],
+ "backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/query/impl/ESGenericQueryFactory.java": [
+ {
+ "hashed_secret": "084c833a01fb1d770f994aaec6a07f282e41827a",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 379,
+ "type": "Base64 High Entropy String"
+ },
+ {
+ "hashed_secret": "38d9070c435d5fc2e1186bf2c4ff4ddd39dc60c7",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 380,
+ "type": "Base64 High Entropy String"
+ }
+ ],
"backend/src/main/java/fr/inra/urgi/faidare/repository/es/GermplasmRepositoryImpl.java": [
{
"hashed_secret": "344a627efbdf17dfc804f04e2eb1626843c0e825",
"is_secret": false,
"is_verified": false,
- "line_number": 113,
+ "line_number": 163,
"type": "Base64 High Entropy String"
}
],
@@ -398,7 +460,7 @@
"hashed_secret": "1d140def038cb8ed1fc9dcf662d2851a64fa277f",
"is_secret": false,
"is_verified": false,
- "line_number": 50,
+ "line_number": 68,
"type": "Base64 High Entropy String"
}
],
@@ -787,6 +849,29 @@
"type": "Base64 High Entropy String"
}
],
+ "backend/src/test/resources/fr/inra/urgi/faidare/elasticsearch/query/impl/expected/query8.json": [
+ {
+ "hashed_secret": "084c833a01fb1d770f994aaec6a07f282e41827a",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 18,
+ "type": "Base64 High Entropy String"
+ },
+ {
+ "hashed_secret": "ce74e278f4bd61efdd35fcdce522284654db7762",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 79,
+ "type": "Base64 High Entropy String"
+ },
+ {
+ "hashed_secret": "a2aa9fa2bfb92c62d375348f3742857cf8190288",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 86,
+ "type": "Base64 High Entropy String"
+ }
+ ],
"backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/fixture/datadiscovery0.json": [
{
"hashed_secret": "5b8be2878e5e88bbede6815df7f3d95af70f4c7c",
@@ -1571,7 +1656,7 @@
"hashed_secret": "5f4f4f2f920d8153565cb6cf457c2c42c13fc16f",
"is_secret": false,
"is_verified": false,
- "line_number": 31,
+ "line_number": 32,
"type": "Base64 High Entropy String"
}
],
@@ -1642,7 +1727,7 @@
"hashed_secret": "297895805be78abcf85a2deb1c472fb57fd97903",
"is_secret": false,
"is_verified": false,
- "line_number": 27,
+ "line_number": 38,
"type": "Base64 High Entropy String"
}
],
@@ -1689,6 +1774,83 @@
"type": "Base64 High Entropy String"
}
],
+ "frontend/src/app/facets/large-facets/large-facets.component.spec.ts": [
+ {
+ "hashed_secret": "83f7b470406d6cbca92e194913cdbdc5ea1b85c9",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 20,
+ "type": "Base64 High Entropy String"
+ }
+ ],
+ "frontend/src/app/facets/small-facets/small-facets.component.html": [
+ {
+ "hashed_secret": "afb93ee4477b9a6582c902606428278a05da3618",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 17,
+ "type": "Base64 High Entropy String"
+ }
+ ],
+ "frontend/src/app/facets/small-facets/small-facets.component.spec.ts": [
+ {
+ "hashed_secret": "81288bf2844b17e3c97050a47cb6c3babcbc92da",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 17,
+ "type": "Base64 High Entropy String"
+ }
+ ],
+ "frontend/src/app/facets/small-facets/small-facets.component.ts": [
+ {
+ "hashed_secret": "3a31f524452919142fbdd3d62c8eed1512d3eb4b",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 47,
+ "type": "Base64 High Entropy String"
+ }
+ ],
+ "frontend/src/app/facets/switch-button/switch-button.component.html": [
+ {
+ "hashed_secret": "3a31f524452919142fbdd3d62c8eed1512d3eb4b",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 4,
+ "type": "Base64 High Entropy String"
+ },
+ {
+ "hashed_secret": "2169579b2d46b57be73fd0962c07b1da063fd563",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 10,
+ "type": "Base64 High Entropy String"
+ },
+ {
+ "hashed_secret": "ea699843f43129a8e7e19b5f49f0a75ef04c1219",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 16,
+ "type": "Base64 High Entropy String"
+ }
+ ],
+ "frontend/src/app/facets/switch-button/switch-button.component.spec.ts": [
+ {
+ "hashed_secret": "f29e999f75ca9fefd4d2120152d457e18534c23c",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 11,
+ "type": "Base64 High Entropy String"
+ }
+ ],
+ "frontend/src/app/facets/switch-button/switch-button.component.ts": [
+ {
+ "hashed_secret": "383b10964f8ad1adbc337eba49c2caa3a70f8e76",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 11,
+ "type": "Base64 High Entropy String"
+ }
+ ],
"frontend/src/app/form/suggestion-field/suggestion-field.component.spec.ts": [
{
"hashed_secret": "409bbacccbf11c0ad835f1c018f011c2a28df4a2",
@@ -1703,7 +1865,7 @@
"hashed_secret": "178f273ddd986fbda29871ffb6bb99af44ced4b0",
"is_secret": false,
"is_verified": false,
- "line_number": 10,
+ "line_number": 13,
"type": "Base64 High Entropy String"
}
],
@@ -1816,7 +1978,7 @@
"hashed_secret": "c2ce2309fdc9b5fb339ba101b5a7038a4236d1ac",
"is_secret": false,
"is_verified": false,
- "line_number": 205,
+ "line_number": 197,
"type": "Base64 High Entropy String"
}
],
@@ -1825,7 +1987,64 @@
"hashed_secret": "59f1ef979270086bb313d0dd75acb3d035aa68b6",
"is_secret": false,
"is_verified": false,
- "line_number": 10,
+ "line_number": 15,
+ "type": "Base64 High Entropy String"
+ }
+ ],
+ "frontend/src/app/germplasm-result-page/germplasm-result-page.component.html": [
+ {
+ "hashed_secret": "18b38fc00663dfd73cc4fbf8d03acb965a981ec9",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 22,
+ "type": "Base64 High Entropy String"
+ }
+ ],
+ "frontend/src/app/germplasm-result-page/germplasm-result-page.component.spec.ts": [
+ {
+ "hashed_secret": "fe8321f237ba8e8dd0cd47ace880133faca88569",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 21,
+ "type": "Base64 High Entropy String"
+ }
+ ],
+ "frontend/src/app/germplasm-result-page/germplasm-result-page.component.ts": [
+ {
+ "hashed_secret": "984a29d9e1e162a89ea0f9a74cac732fd7ae613c",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 19,
+ "type": "Base64 High Entropy String"
+ },
+ {
+ "hashed_secret": "38d9070c435d5fc2e1186bf2c4ff4ddd39dc60c7",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 53,
+ "type": "Base64 High Entropy String"
+ },
+ {
+ "hashed_secret": "ce74e278f4bd61efdd35fcdce522284654db7762",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 56,
+ "type": "Base64 High Entropy String"
+ },
+ {
+ "hashed_secret": "a577a4f5f8dab94eff3f257aec15319f14a8037a",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 57,
+ "type": "Base64 High Entropy String"
+ }
+ ],
+ "frontend/src/app/gnpis.service.spec.ts": [
+ {
+ "hashed_secret": "1d140def038cb8ed1fc9dcf662d2851a64fa277f",
+ "is_secret": false,
+ "is_verified": false,
+ "line_number": 165,
"type": "Base64 High Entropy String"
}
],
@@ -1929,12 +2148,12 @@
"type": "Base64 High Entropy String"
}
],
- "frontend/src/app/result-page/facets/facets.component.html": [
+ "frontend/src/app/result-page/result-page.component.html": [
{
- "hashed_secret": "afb93ee4477b9a6582c902606428278a05da3618",
+ "hashed_secret": "ff40c04427876c07708f96b8bef7e83acc6e66a2",
"is_secret": false,
"is_verified": false,
- "line_number": 7,
+ "line_number": 120,
"type": "Base64 High Entropy String"
}
],
@@ -2338,7 +2557,7 @@
"hashed_secret": "9b4ea0964706f977148ec989e7373d9622613547",
"is_secret": false,
"is_verified": false,
- "line_number": 162,
+ "line_number": 184,
"type": "Base64 High Entropy String"
}
]
diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
index e80e4269580a4d4efde2b6af7614ed9e336ec897..22b76b8318103b68f93f2cd3791428e2dd88b66e 100644
--- a/backend/build.gradle.kts
+++ b/backend/build.gradle.kts
@@ -17,6 +17,7 @@ plugins {
id("com.gorylenko.gradle-git-properties") version "1.5.2"
id("io.spring.dependency-management") version "1.0.6.RELEASE"
id("org.sonarqube")
+ id("org.owasp.dependencycheck") version "6.0.3"
}