Skip to content

[ES-2900] [ES-2903] Invalid field validations for server profile features and additional config keys #1670

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
anushasunkada merged 3 commits into from
Apr 8, 2026
Merged

[ES-2900] [ES-2903] Invalid field validations for server profile features and additional config keys #1670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98ab943
Invalid field validations for server profile features and additional …
Md-Humair-KK Mar 16, 2026
1d9403a
renamed method
Md-Humair-KK Mar 24, 2026
18cd98d
Merge branch 'develop' of https://github.com/mosip/esignet into ES-2900
Md-Humair-KK Mar 24, 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
23 changes: 22 additions & 1 deletion esignet-service/src/main/java/io/mosip/esignet/config/AppConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@
@Slf4j
public class AppConfig implements ApplicationRunner {

private static final List<String> SERVER_PROFILE_FEATURES = List.of("PAR", "DPOP", "PKCE", "JWE");
private static final List<String> SERVER_PROFILE_ADDITIONAL_CONFIG_KEYS = List.of(
"dpop_bound_access_tokens",
"require_pkce",
"user_info_response_type",
"require_pushed_authorization_requests"
);


@Value("${mosip.esignet.default.httpclient.connections.max.per.host:20}")
private int defaultMaxConnectionPerRoute;
Expand Down Expand Up @@ -99,7 +107,20 @@ public ServerProfile serverProfile() throws EsignetException {
}

for (io.mosip.esignet.entity.ServerProfile serverProfileEntity : profiles) {
profileDataMap.put(serverProfileEntity.getAdditionalConfigKey(), serverProfileEntity.getFeature());
String feature = serverProfileEntity.getFeature();
String additionalConfigKey = serverProfileEntity.getAdditionalConfigKey();

if (!SERVER_PROFILE_FEATURES.contains(feature.toUpperCase())) {
log.error("Invalid feature '{}' in ServerProfile. Valid features are: {}", feature, SERVER_PROFILE_FEATURES);
throw new EsignetException("INVALID_SERVER_PROFILE");
}
if (!SERVER_PROFILE_ADDITIONAL_CONFIG_KEYS.contains(additionalConfigKey)) {
log.error("Invalid additionalConfigKey '{}' in ServerProfile. Valid keys are: {}",
additionalConfigKey, SERVER_PROFILE_ADDITIONAL_CONFIG_KEYS);
throw new EsignetException("INVALID_SERVER_PROFILE");
}

profileDataMap.put(additionalConfigKey, feature);
}
return profile;
}
Expand Down
56 changes: 56 additions & 0 deletions esignet-service/src/test/java/io/mosip/esignet/AppConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,61 @@ void serverProfile_ProfilesExist_ReturnsProfileWithFeatures() throws EsignetExce
assertEquals(1, result.getFeatureMap().size());
assertEquals("PKCE", result.getFeatureMap().get("require_pkce"));
}

@Test
void serverProfile_InvalidFeature_ThrowsException() {
ReflectionTestUtils.setField(appConfig, "serverProfile", "fapi2.0");
io.mosip.esignet.entity.ServerProfile profileEntity = new io.mosip.esignet.entity.ServerProfile();
profileEntity.setAdditionalConfigKey("require_pkce");
profileEntity.setFeature("INVALID_FEATURE");
when(serverProfileRepository.findByProfileName("fapi2.0"))
.thenReturn(Collections.singletonList(profileEntity));

EsignetException exception = assertThrows(EsignetException.class, () -> appConfig.serverProfile());
assertEquals("INVALID_SERVER_PROFILE", exception.getMessage());
}

@Test
void serverProfile_InvalidAdditionalConfigKey_ThrowsException() {
ReflectionTestUtils.setField(appConfig, "serverProfile", "fapi2.0");
io.mosip.esignet.entity.ServerProfile profileEntity = new io.mosip.esignet.entity.ServerProfile();
profileEntity.setAdditionalConfigKey("invalid_config_key");
profileEntity.setFeature("DPOP");
when(serverProfileRepository.findByProfileName("fapi2.0"))
.thenReturn(Collections.singletonList(profileEntity));

EsignetException exception = assertThrows(EsignetException.class, () -> appConfig.serverProfile());
assertEquals("INVALID_SERVER_PROFILE", exception.getMessage());
}

@Test
void serverProfile_ValidFapi2Profile_ReturnsProfileWithAllFeatures() throws EsignetException {
ReflectionTestUtils.setField(appConfig, "serverProfile", "fapi2.0");

io.mosip.esignet.entity.ServerProfile dpopProfile = new io.mosip.esignet.entity.ServerProfile();
dpopProfile.setAdditionalConfigKey("dpop_bound_access_tokens");
dpopProfile.setFeature("DPOP");

io.mosip.esignet.entity.ServerProfile parProfile = new io.mosip.esignet.entity.ServerProfile();
parProfile.setAdditionalConfigKey("require_pushed_authorization_requests");
parProfile.setFeature("PAR");

io.mosip.esignet.entity.ServerProfile pkceProfile = new io.mosip.esignet.entity.ServerProfile();
pkceProfile.setAdditionalConfigKey("require_pkce");
pkceProfile.setFeature("PKCE");

when(serverProfileRepository.findByProfileName("fapi2.0"))
.thenReturn(java.util.Arrays.asList(dpopProfile, parProfile, pkceProfile));

ServerProfile result = appConfig.serverProfile();

assertNotNull(result);
assertEquals("fapi2.0", result.getName());
assertEquals(3, result.getFeatureMap().size());
assertEquals("DPOP", result.getFeatureMap().get("dpop_bound_access_tokens"));
assertEquals("PAR", result.getFeatureMap().get("require_pushed_authorization_requests"));
assertEquals("PKCE", result.getFeatureMap().get("require_pkce"));
}

}

Loading