#4379 Improve Stroom permission model

gchq · Aug 5, 2024 · 095f473 · 095f473
1 parent cc004c8
commit 095f473
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/stroom-app/dev.yml b/stroom-app/dev.yml
@@ -104,12 +104,6 @@ appConfig:
     home: "${STROOM_HOME:-~/.stroom/v7/node1a}"
     temp: "${STROOM_TEMP:-/tmp/stroom/v7/node1a}"
 
-  # Uncomment the following to develop React code with `yarn start`
-  #  uiUri:
-  #    scheme: http
-  #    hostname: localhost
-  #    port: 3000
-
   # Comment out the publicUri block if you are not running with nginx
   publicUri:
     hostname: ${API_GATEWAY_HOST:-localhost}
@@ -123,13 +117,6 @@ appConfig:
       openId:
         identityProviderType: ${IDP_TYPE:-TEST_CREDENTIALS}
 
-  #   Uncomment the following to develop React code with `yarn start`
-  #      webContent:
-  #        contentSecurityPolicy: ""
-  #        contentTypeOptions: ""
-  #        frameOptions: ""
-  #        xssProtection: ""
-
   serviceDiscovery:
     zookeeperUrl: ${STROOM_SERVICE_DISCOVERY_ZOOKEEPER_URL:-localhost:2181}
     servicesHostNameOrIpAddress: ${STROOM_ADVERTISED_URL:-localhost}

diff --git a/...ty/stroom-security-impl/src/main/java/stroom/security/impl/StroomUserIdentityFactory.java b/...ty/stroom-security-impl/src/main/java/stroom/security/impl/StroomUserIdentityFactory.java
@@ -442,7 +442,8 @@ private Optional<User> getOrCreateUserBySubjectId(final String subjectId) {
         } else {
             Optional<User> optUser = cacheBySubjectId.get(subjectId);
             if (optUser.isEmpty()) {
-                optUser = Optional.ofNullable(userServiceProvider.get().getOrCreateUser(subjectId));
+                optUser = securityContext.asProcessingUserResult(() ->
+                        Optional.ofNullable(userServiceProvider.get().getOrCreateUser(subjectId)));
                 if (optUser.isPresent()) {
                     cacheBySubjectId.put(subjectId, optUser);
                 }