Skip to content

bump java/deps/SB #72

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.

Sign up for GitHub

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

Merged
ggmaleva merged 4 commits into from
Apr 23, 2026
Merged

bump java/deps/SB #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
07708e2
bump java/deps/SB
ggmaleva Apr 23, 2026
5aafa1b
bump workflow
ggmaleva Apr 23, 2026
8088f60
fix checkstyle
ggmaleva Apr 23, 2026
a40296b
fix
ggmaleva Apr 23, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ on:

jobs:
build:
uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v2.0.11
uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v3
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
build-and-deploy:
uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v2
uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v3
secrets:
github-token: ${{ secrets.GITHUB_TOKEN }}
mm-webhook-url: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
106 changes: 38 additions & 68 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.vality</groupId>
<artifactId>service-parent-pom</artifactId>
<version>2.1.8</version>
<version>3.1.7</version>
</parent>

<artifactId>org-manager</artifactId>
Expand All @@ -16,27 +16,27 @@
<name>org-manager</name>

<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<server.port>8022</server.port>
<server.rest.port>8080</server.rest.port>
<management.port>8023</management.port>
<exposed.ports>${server.port} ${server.rest.port} ${management.port}</exposed.ports>
<spring-security.version>5.6.12</spring-security.version>
<keycloak.version>17.0.0</keycloak.version>
<schedlock.version>4.34.0</schedlock.version>
<swag.organizations.version>1.19-8707f87-server</swag.organizations.version>
<swag.organizations.version>1.38-8c9b968</swag.organizations.version>
<wiremock-jre8-standalone.version>2.32.0</wiremock-jre8-standalone.version>
<damsel.version>1.685-5c25c2e</damsel.version>
</properties>

<dependencies>
<!--vality-->
<dependency>
<groupId>dev.vality.woody</groupId>
<artifactId>woody-thrift</artifactId>
<version>${woody.version}</version>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>dev.vality</groupId>
Expand All @@ -45,17 +45,18 @@
</dependency>
<dependency>
<groupId>dev.vality</groupId>
<artifactId>swag-organizations</artifactId>
<version>1.25-de0cd06-server</version>
<artifactId>swag-organizations-server</artifactId>
<version>${swag.organizations.version}</version>
</dependency>
<dependency>
<groupId>dev.vality</groupId>
<artifactId>damsel</artifactId>
<version>${damsel.version}</version>
</dependency>
<dependency>
<groupId>dev.vality</groupId>
<artifactId>org-management-proto</artifactId>
<version>1.11-03a269d</version>
<version>1.18-6b1eb95</version>
<exclusions>
<exclusion>
<groupId>dev.vality</groupId>
Expand All @@ -66,7 +67,7 @@
<dependency>
<groupId>dev.vality</groupId>
<artifactId>bouncer-proto</artifactId>
<version>1.41-5628c61</version>
<version>1.57-31866c3</version>
</dependency>
<!--spring-->
<dependency>
Expand Down Expand Up @@ -94,26 +95,10 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-security-config</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-security-web</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
<version>${spring-security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<version>${spring-security.version}</version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
</dependency>
<dependency>
<groupId>net.javacrumbs.shedlock</groupId>
Expand All @@ -128,37 +113,8 @@

<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client</artifactId>
<artifactId>keycloak-core</artifactId>
<version>${keycloak.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-multipart-provider</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson2-provider</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxb-provider</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-spring-security-adapter</artifactId>
<version>${keycloak.version}</version>
<exclusions>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
Expand All @@ -177,14 +133,9 @@
<artifactId>micrometer-registry-prometheus</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>2.0.1.Final</version>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
Expand All @@ -193,12 +144,15 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.4.3</version>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-database-postgresql</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
Expand Down Expand Up @@ -231,7 +185,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-wiremock</artifactId>
<version>3.1.1</version>
<version>4.1.5</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -319,6 +273,22 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>21</source>
<target>21</target>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.36</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
</build>
</project>
68 changes: 41 additions & 27 deletions src/main/java/dev/vality/orgmanager/config/ConfigResolverConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,51 +2,65 @@

import com.google.common.base.Strings;
import dev.vality.orgmanager.config.properties.KeyCloakProperties;
import org.keycloak.adapters.KeycloakConfigResolver;
import org.keycloak.adapters.KeycloakDeployment;
import org.keycloak.adapters.KeycloakDeploymentBuilder;
import org.keycloak.adapters.springsecurity.config.KeycloakSpringConfigResolverWrapper;
import org.keycloak.representations.adapters.config.AdapterConfig;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.DependsOn;
import org.springframework.security.oauth2.core.DelegatingOAuth2TokenValidator;
import org.springframework.security.oauth2.core.OAuth2TokenValidator;
import org.springframework.security.oauth2.jwt.Jwt;
import org.springframework.security.oauth2.jwt.JwtDecoder;
import org.springframework.security.oauth2.jwt.JwtValidators;
import org.springframework.security.oauth2.jwt.NimbusJwtDecoder;

import java.io.IOException;
import java.security.KeyFactory;
import java.security.NoSuchAlgorithmException;
import java.security.interfaces.RSAPublicKey;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.X509EncodedKeySpec;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Base64;
import java.util.List;
import java.util.stream.Collectors;

@Configuration
@ConditionalOnProperty(value = "auth.enabled", havingValue = "true")
public class ConfigResolverConfig {

@Bean
public KeycloakConfigResolver keycloakConfigResolver(KeyCloakProperties keyCloakProperties) {
return facade -> {
KeycloakDeployment deployment = KeycloakDeploymentBuilder.build(adapterConfig(keyCloakProperties));
deployment.setNotBefore(keyCloakProperties.getNotBefore());
return deployment;
};
public JwtDecoder jwtDecoder(KeyCloakProperties keyCloakProperties) {
RSAPublicKey publicKey = readPublicKey(keycloakRealmPublicKey(keyCloakProperties));
NimbusJwtDecoder jwtDecoder = NimbusJwtDecoder.withPublicKey(publicKey).build();

String issuer = String.format(
"%s/realms/%s",
keyCloakProperties.getAuthServerUrl(),
keyCloakProperties.getRealm()
);
OAuth2TokenValidator<Jwt> withIssuer = JwtValidators.createDefaultWithIssuer(issuer);
OAuth2TokenValidator<Jwt> validator = new DelegatingOAuth2TokenValidator<>(withIssuer);
jwtDecoder.setJwtValidator(validator);
return jwtDecoder;
}

private AdapterConfig adapterConfig(KeyCloakProperties keyCloakProperties) {
String keycloakRealmPublicKey;
private String keycloakRealmPublicKey(KeyCloakProperties keyCloakProperties) {
if (!Strings.isNullOrEmpty(keyCloakProperties.getRealmPublicKeyFilePath())) {
keycloakRealmPublicKey = readKeyFromFile(keyCloakProperties.getRealmPublicKeyFilePath());
} else {
keycloakRealmPublicKey = keyCloakProperties.getRealmPublicKey();
return readKeyFromFile(keyCloakProperties.getRealmPublicKeyFilePath());
}
return keyCloakProperties.getRealmPublicKey();
}

AdapterConfig adapterConfig = new AdapterConfig();
adapterConfig.setRealm(keyCloakProperties.getRealm());
adapterConfig.setRealmKey(keycloakRealmPublicKey);
adapterConfig.setResource(keyCloakProperties.getResource());
adapterConfig.setAuthServerUrl(keyCloakProperties.getAuthServerUrl());
adapterConfig.setUseResourceRoleMappings(true);
adapterConfig.setBearerOnly(true);
adapterConfig.setSslRequired(keyCloakProperties.getSslRequired());
return adapterConfig;
private RSAPublicKey readPublicKey(String publicKey) {
String normalizedPublicKey = publicKey.replaceAll("\\s", "");
byte[] decoded = Base64.getDecoder().decode(normalizedPublicKey);
X509EncodedKeySpec spec = new X509EncodedKeySpec(decoded);
try {
KeyFactory keyFactory = KeyFactory.getInstance("RSA");
return (RSAPublicKey) keyFactory.generatePublic(spec);
} catch (NoSuchAlgorithmException | InvalidKeySpecException ex) {
throw new IllegalStateException("Unable to parse keycloak realm public key", ex);
}
}

private String readKeyFromFile(String filePath) {
Expand Down
26 changes: 0 additions & 26 deletions src/main/java/dev/vality/orgmanager/config/PartyManagementConfig.java
View file
Open in desktop

This file was deleted.

Loading
Loading