Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Snyk/updates 10 2024 #748

Merged
merged 19 commits into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
027000b
fix: upgrade axios from 1.7.4 to 1.7.7
snyk-io[bot] Sep 23, 2024
9209b5c
fix: upgrade org.liquibase:liquibase-core from 4.29.1 to 4.29.2
snyk-io[bot] Sep 27, 2024
24b4edc
fix: upgrade io.netty:netty-resolver-dns-native-macos from 4.1.112.Fi…
snyk-io[bot] Sep 27, 2024
869b23d
fix: upgrade react-router-dom from 6.26.1 to 6.26.2
snyk-io[bot] Sep 30, 2024
de0c517
fix: backend/pom.xml to reduce vulnerabilities
snyk-io[bot] Oct 19, 2024
e41e3ab
fix: backend/pom.xml to reduce vulnerabilities
snyk-io[bot] Oct 22, 2024
0af6650
fix: backend/pom.xml to reduce vulnerabilities
snyk-io[bot] Oct 25, 2024
f06e131
fix: backend/pom.xml to reduce vulnerabilities
snyk-io[bot] Oct 26, 2024
45bbf0e
fix: backend/pom.xml to reduce vulnerabilities
snyk-io[bot] Oct 29, 2024
484f368
Merge remote-tracking branch 'origin/snyk-fix-6b5459842c1f981532ad99f…
jrkkp Oct 30, 2024
07df9ee
Merge remote-tracking branch 'origin/snyk-fix-cf55de1aea2a341e336ff34…
jrkkp Oct 30, 2024
1d30881
Merge remote-tracking branch 'origin/snyk-fix-3132d1bb4c0e6fccda112db…
jrkkp Oct 30, 2024
10f27fa
Merge remote-tracking branch 'origin/snyk-fix-b8aec280df5eef1cdba7bba…
jrkkp Oct 30, 2024
90a6a07
Merge remote-tracking branch 'origin/snyk-upgrade-5fb5a6b73455c3de21a…
jrkkp Oct 30, 2024
2c3f040
Merge remote-tracking branch 'origin/snyk-upgrade-e0f8b7c528daefc2095…
jrkkp Oct 30, 2024
27cc186
Merge remote-tracking branch 'origin/snyk-upgrade-49c4f4ba12d8a5fd9a9…
jrkkp Oct 30, 2024
1719535
Merge remote-tracking branch 'origin/snyk-upgrade-25ad1b44375b3526f21…
jrkkp Oct 30, 2024
c1fbace
VKT:AKR:OTR:YKI(Backend) Dummy commit for [deploy]
jrkkp Oct 30, 2024
e762a2a
YKI(Backend) Disable default authentication [deploy]
jrkkp Oct 31, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions backend/akr/src/main/java/fi/oph/akr/config/AppConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,15 @@ public SpringResourceTemplateResolver emailTemplateResolver(final ApplicationCon
}

private static WebClient.Builder webClientBuilderWithCallerId(final String connectionProviderName) {
ConnectionProvider connectionProvider = ConnectionProvider
final ConnectionProvider connectionProvider = ConnectionProvider
.builder(connectionProviderName)
.maxConnections(50)
.maxIdleTime(Duration.ofSeconds(20))
.maxLifeTime(Duration.ofSeconds(60))
.pendingAcquireTimeout(Duration.ofSeconds(60))
.evictInBackground(Duration.ofSeconds(120))
.build();
HttpClient httpClient = HttpClient.create(connectionProvider);
final HttpClient httpClient = HttpClient.create(connectionProvider);
return WebClient
.builder()
.defaultHeader("Caller-Id", Constants.CALLER_ID)
Expand Down
1 change: 0 additions & 1 deletion backend/otr/src/main/java/fi/oph/otr/util/DateUtil.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package fi.oph.otr.util;

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;

public class DateUtil {
Expand Down
8 changes: 4 additions & 4 deletions backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
<!-- openai v2 https://springdoc.org/#migrating-from-springdoc-v1 -->
<springdoc-openapi.version>2.6.0</springdoc-openapi.version>
<!-- latest version for Java 17 https://github.com/lukas-krecan/ShedLock#versions -->
<shedlock.version>4.48.0</shedlock.version>
<shedlock.version>5.13.0</shedlock.version>
<poi.version>5.3.0</poi.version>
<liquibase.version>4.29.1</liquibase.version>
<liquibase.version>4.29.2</liquibase.version>
</properties>

<dependencies>
Expand All @@ -55,13 +55,13 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<version>6.3.3</version>
<version>6.3.4</version>
</dependency>
<!-- Force 6.3.3 since there is vulnerability in 6.3.1 -->
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
<version>6.3.3</version>
<version>6.3.4</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
2 changes: 1 addition & 1 deletion backend/vkt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver-dns-native-macos</artifactId>
<version>4.1.112.Final</version>
<version>4.1.113.Final</version>
<classifier>osx-aarch_64</classifier>
<scope>runtime</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package fi.oph.vkt.repository;

import fi.oph.vkt.model.CasTicket;
import fi.oph.vkt.model.Person;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;
Expand Down
2 changes: 1 addition & 1 deletion backend/yki/src/main/java/fi/oph/yki/YkiApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
@SpringBootApplication
public class YkiApplication {

public static void main(String[] args) {
public static void main(final String[] args) {
SpringApplication.run(YkiApplication.class, args);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.AuthenticationServiceException;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.web.SecurityFilterChain;
Expand Down Expand Up @@ -31,4 +33,11 @@ public static HttpSecurity configCsrf(final HttpSecurity httpSecurity) throws Ex
configurer.csrfTokenRepository(csrfTokenRepository).csrfTokenRequestHandler(requestHandler)
);
}

@Bean
public AuthenticationManager noopAuthenticationManager() {
return authentication -> {
throw new AuthenticationServiceException("Authentication is disabled");
};
}
}
4 changes: 2 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@mui/x-date-pickers": "^5.0.20",
"@reduxjs/toolkit": "^1.9.7",
"@types/js-cookie": "^3.0.6",
"axios": "^1.7.4",
"axios": "^1.7.7",
"dayjs": "^1.11.13",
"finnish-personal-identity-code-validator": "kimmotaskinen/finnish-personal-identity-code-validator#support-new-delimiters",
"history": "^5.3.0",
Expand All @@ -46,7 +46,7 @@
"react-dom": "^18.3.1",
"react-i18next": "^13.5.0",
"react-redux": "^8.1.3",
"react-router-dom": "6.26.1",
"react-router-dom": "6.26.2",
"redux-saga": "^1.3.0"
},
"devDependencies": {
Expand Down
42 changes: 21 additions & 21 deletions frontend/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2633,7 +2633,7 @@ __metadata:
"@types/react-test-renderer": "npm:^18.0.5"
"@typescript-eslint/eslint-plugin": "npm:^6.10.0"
"@typescript-eslint/parser": "npm:^6.10.0"
axios: "npm:^1.7.4"
axios: "npm:^1.7.7"
babel-jest: "npm:^29.7.0"
babel-loader: "npm:^9.1.3"
compression-webpack-plugin: "npm:^10.0.0"
Expand Down Expand Up @@ -2670,7 +2670,7 @@ __metadata:
react-dom: "npm:^18.3.1"
react-i18next: "npm:^13.5.0"
react-redux: "npm:^8.1.3"
react-router-dom: "npm:6.26.1"
react-router-dom: "npm:6.26.2"
react-test-renderer: "npm:^18.2.0"
redux-saga: "npm:^1.3.0"
sass: "npm:^1.69.5"
Expand Down Expand Up @@ -2816,10 +2816,10 @@ __metadata:
languageName: node
linkType: hard

"@remix-run/router@npm:1.19.1":
version: 1.19.1
resolution: "@remix-run/router@npm:1.19.1"
checksum: 2800c2f6567a982fe942aacc4cb5b170e7cc89bd455960e3bea2424161ff7dac32d01886322d88dd19b88d1bea711f39566d17f02b73eeb74999affb471f8f52
"@remix-run/router@npm:1.19.2":
version: 1.19.2
resolution: "@remix-run/router@npm:1.19.2"
checksum: 31b62b66ea68bd62018189047de7b262700113438f62407df019f81a9856a08a705b2b77454be9293518e2f5f3bbf3f8b858ac19f48cb7d89f8ab56b7b630c19
languageName: node
linkType: hard

Expand Down Expand Up @@ -4331,14 +4331,14 @@ __metadata:
languageName: node
linkType: hard

"axios@npm:^1.7.4":
version: 1.7.4
resolution: "axios@npm:1.7.4"
"axios@npm:^1.7.7":
version: 1.7.7
resolution: "axios@npm:1.7.7"
dependencies:
follow-redirects: "npm:^1.15.6"
form-data: "npm:^4.0.0"
proxy-from-env: "npm:^1.1.0"
checksum: 7a1429be1e3d0c2e1b96d4bba4d113efbfabc7c724bed107beb535c782c7bea447ff634886b0c7c43395a264d085450d009eb1154b5f38a8bae49d469fdcbc61
checksum: 7f875ea13b9298cd7b40fd09985209f7a38d38321f1118c701520939de2f113c4ba137832fe8e3f811f99a38e12c8225481011023209a77b0c0641270e20cde1
languageName: node
linkType: hard

Expand Down Expand Up @@ -11076,27 +11076,27 @@ __metadata:
languageName: node
linkType: hard

"react-router-dom@npm:6.26.1":
version: 6.26.1
resolution: "react-router-dom@npm:6.26.1"
"react-router-dom@npm:6.26.2":
version: 6.26.2
resolution: "react-router-dom@npm:6.26.2"
dependencies:
"@remix-run/router": "npm:1.19.1"
react-router: "npm:6.26.1"
"@remix-run/router": "npm:1.19.2"
react-router: "npm:6.26.2"
peerDependencies:
react: ">=16.8"
react-dom: ">=16.8"
checksum: 1bd255d1ff88f477699c72656e7c07702a907e644388a1bea1c648f2df0c3c86db2e90bea945b1d43eaf84ebab194f3868f3788502965ad5f20c508c6874f1fe
checksum: 4eee37839bd1a660807c090b4d272e4aa9b95d8a9a932cdcdf7c5b10735f39b6db73bad79b08a3012386a7e225ff6bf60435e2741fb7c68e137ac5a6295d4308
languageName: node
linkType: hard

"react-router@npm:6.26.1":
version: 6.26.1
resolution: "react-router@npm:6.26.1"
"react-router@npm:6.26.2":
version: 6.26.2
resolution: "react-router@npm:6.26.2"
dependencies:
"@remix-run/router": "npm:1.19.1"
"@remix-run/router": "npm:1.19.2"
peerDependencies:
react: ">=16.8"
checksum: b3761515c75da65a1678f005d08a6285ceccd9df7237ae6fdd9ab2ab816ef328435b75610f705ecd9ecd41c6878fd22eb9b44c5391cdef2e1ed99ddbc78de8a4
checksum: 496e855b53e61066c1791e354f5d79eab56a128d9722fdc6486c3ecd3b3a0bf9968e927028f429893b157f3cc10fc09e890a055847723ee242663e7995fedc9d
languageName: node
linkType: hard

Expand Down
Loading