Merge branch 'main' into MUXDBS-101-adjustments

Author: Dominik Grenz

.github/workflows/codeql.yml

@@ -51,7 +51,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        build-path: ["./personalization-service", "./ticketing-eventing/eventing-service"] # JSON array formatted as string, contains the paths to the java projects to build
+        # paths to the java projects to build
+        build-path:
+          - "./personalization-service"
+          - "./ticketing-eai/api-client-internal"
+          - "./ticketing-eventing/eventing-service"
+          - "./ticketing-eventing/handler-core"
+          - "./ticketing-eventing/mail-handler-service"
     steps:
       - uses: it-at-m/lhm_actions/action-templates/actions/action-codeql@9767179088fd2e344d1a24c17404ab809a60f1b6 # v1.0.20
         if: ${{ env.analyze-java == 'true' && (github.ref_name == 'main' || needs.check-changes.outputs.java == 'true') }}

.github/workflows/maven-node-build.yml

@@ -25,6 +25,8 @@ jobs:
             build-image: true
           - app-path: ticketing-eventing/handler-core
             build-image: false
+          - app-path: ticketing-eventing/mail-handler-service
+            build-image: true
 
     steps:
       - uses: it-at-m/lhm_actions/action-templates/actions/action-checkout@9767179088fd2e344d1a24c17404ab809a60f1b6 # v1.0.20

.github/workflows/maven-release.yml

@@ -20,6 +20,7 @@ on:
           - ticketing-eai/api-client-internal
           - ticketing-eventing/eventing-service
           - ticketing-eventing/handler-core
+          - ticketing-eventing/mail-handler-service
 
 jobs:
   release-maven:
@@ -68,4 +69,3 @@ jobs:
           artifact-name: ${{ needs.release-maven.outputs.ARTIFACT_NAME }}
           tag-name: ${{ inputs.app-path }}-${{ github.event.inputs.releaseVersion }}
           artifact-path: ${{ github.event.inputs.app-path }}/target/*.jar
-

.gitignore

@@ -185,5 +185,3 @@ nbdist/
 *.njsproj
 *.sln
 *.sw?
-
-out

.run/DbsTicketingEventingMailHandlerService.run.xml

@@ -0,0 +1,20 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="DbsTicketingEventingMailHandlerService" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+    <option name="ACTIVE_PROFILES" value="local" />
+    <module name="mail-handler-service" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="de.muenchen.oss.dbs.ticketing.eventing.mailhandler.DbsTicketingEventingMailHandlerService" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

personalization-service/src/main/java/de/muenchen/dbs/personalization/configuration/P13nConfiguration.java

@@ -0,0 +1,30 @@
+package de.muenchen.dbs.personalization.configuration;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Profile;
+import org.springframework.validation.annotation.Validated;
+
+@ConfigurationProperties(prefix = "p13n")
+@Validated
+@Profile("!no-security")
+@Data
+public class P13nConfiguration {
+    /**
+     * ServiceNavigator API URL.
+     */
+    @NotBlank
+    private String serviceNavigatorUrl = "https://stadt.muenchen.de/service/rs/befi/navigator";
+
+    /**
+     * (optional) Proxy Host used to call ServiceNavigator.
+     */
+    private String proxyHost = null;
+
+    /**
+     * (optional) Proxy Port used to call ServiceNavigator.
+     */
+    private int proxyPort = 80;
+
+}

personalization-service/src/main/java/de/muenchen/dbs/personalization/configuration/SecurityConfiguration.java

@@ -52,7 +52,8 @@ public SecurityFilterChain filterChain(final HttpSecurity http) throws Exception
                         // allow access to swagger-ui
                         PathPatternRequestMatcher.withDefaults().matcher(HttpMethod.GET, "/swagger-ui/**"),
                         // allow access to /actuator/metrics for Prometheus monitoring in OpenShift
-                        PathPatternRequestMatcher.withDefaults().matcher(HttpMethod.GET, "/actuator/metrics"))
+                        PathPatternRequestMatcher.withDefaults().matcher(HttpMethod.GET, "/actuator/metrics"),
+                        PathPatternRequestMatcher.withDefaults().matcher(HttpMethod.GET, "/public/**"))
                         .permitAll())
                 .authorizeHttpRequests((requests) -> requests.requestMatchers("/**")
                         .authenticated())

personalization-service/src/main/java/de/muenchen/dbs/personalization/servicenavigator/PublicServiceNavigatorController.java

@@ -0,0 +1,58 @@
+package de.muenchen.dbs.personalization.servicenavigator;
+
+import de.muenchen.dbs.personalization.configuration.P13nConfiguration;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
+
+@RestController
+@RequestMapping("/public/servicenavigator")
+@Slf4j
+@RequiredArgsConstructor
+@Tag(name = "Public ServiceNavigator Endpoints", description = "Endpoints not requiring authentication")
+public class PublicServiceNavigatorController {
+
+    private static final String SERVICENAVIGATOR_QUERY_PARAMETER_ID = "?id=";
+
+    private final RestTemplate restTemplate;
+    private final P13nConfiguration p13nConfiguration;
+
+    @Autowired
+    public PublicServiceNavigatorController(final P13nConfiguration p13nConfiguration) {
+        this.p13nConfiguration = p13nConfiguration;
+
+        if (StringUtils.isBlank(p13nConfiguration.getProxyHost())) {
+            this.restTemplate = new RestTemplate();
+        } else {
+            final Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(p13nConfiguration.getProxyHost(), p13nConfiguration.getProxyPort()));
+            final SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
+            requestFactory.setProxy(proxy);
+            this.restTemplate = new RestTemplate(requestFactory);
+        }
+    }
+
+    @GetMapping
+    @Operation(summary = "Lookup ServiceNavigator Services by ServiceID. Returns a list of services for the given service IDs.")
+    @ResponseStatus(HttpStatus.OK)
+    public List<Object> getServicesByIds(@RequestParam("ids") final String serviceIds) {
+        final String url = p13nConfiguration.getServiceNavigatorUrl() + SERVICENAVIGATOR_QUERY_PARAMETER_ID + serviceIds;
+        final ResponseEntity<List> forEntity = restTemplate.getForEntity(url, List.class);
+        return forEntity.getBody();
+    }
+
+}

personalization-service/src/main/resources/application-local.yml

@@ -42,4 +42,9 @@ sso:
 
 security:
   user-info-uri: ${sso.url}/auth/realms/${sso.realm}/protocol/openid-connect/userinfo
-  logging-mode: all
+  logging-mode: all
+
+p13n:
+  service-navigator-url: "https://stadt.muenchen.de/service/rs/befi/navigator/"
+  proxy-host: "internet-proxy-client.muenchen.de"
+  proxy-port: 80

personalization-service/src/test/java/de/muenchen/dbs/personalization/IntegrationTestBase.java

@@ -4,9 +4,11 @@
 import static de.muenchen.dbs.personalization.TestConstants.SPRING_TEST_PROFILE;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import de.muenchen.dbs.personalization.configuration.P13nConfiguration;
 import java.time.Instant;
 import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.security.oauth2.jwt.Jwt;
@@ -19,6 +21,7 @@
         classes = { PersonalizationServiceApplication.class },
         webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT
 )
+@EnableConfigurationProperties(P13nConfiguration.class)
 @ActiveProfiles(profiles = { SPRING_TEST_PROFILE, SPRING_NO_SECURITY_PROFILE })
 @AutoConfigureMockMvc
 public class IntegrationTestBase {