fix: ciba device notifier header ui and EL support

gravitee-io · Jan 10, 2025 · 932d141 · 932d141
1 parent 05ae562
commit 932d141
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 6 deletions.
diff --git a/gravitee-am-authdevice-notifier/gravitee-am-authdevice-notifier-api/pom.xml b/gravitee-am-authdevice-notifier/gravitee-am-authdevice-notifier-api/pom.xml
@@ -43,7 +43,13 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>io.gravitee.am.repository</groupId>
+            <artifactId>gravitee-am-repository-api</artifactId>
+            <version>4.7.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 
-</project>
+</project>
diff --git a/...api/src/main/java/io/gravitee/am/authdevice/notifier/api/model/ADNotificationRequest.java b/...api/src/main/java/io/gravitee/am/authdevice/notifier/api/model/ADNotificationRequest.java
@@ -15,6 +15,7 @@
  */
 package io.gravitee.am.authdevice.notifier.api.model;
 
+import io.vertx.rxjava3.ext.web.RoutingContext;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -36,4 +37,5 @@ public class ADNotificationRequest {
     private List<String> acrValues;
     private String state;
     private String message;
+    private RoutingContext context;
 }
diff --git a/...avitee/am/authdevice/notifier/http/provider/HttpAuthenticationDeviceNotifierProvider.java b/...avitee/am/authdevice/notifier/http/provider/HttpAuthenticationDeviceNotifierProvider.java
@@ -23,7 +23,11 @@
 import io.gravitee.am.authdevice.notifier.api.model.ADUserResponse;
 import io.gravitee.am.authdevice.notifier.http.HttpAuthenticationDeviceNotifierConfiguration;
 import io.gravitee.am.authdevice.notifier.http.provider.spring.HttpAuthenticationDeviceProviderSpringConfiguration;
+import io.gravitee.am.identityprovider.api.AuthenticationContext;
+import io.gravitee.am.identityprovider.api.SimpleAuthenticationContext;
 import io.gravitee.common.http.HttpStatusCode;
+import io.gravitee.el.TemplateEngine;
+import io.gravitee.el.exceptions.ExpressionEvaluationException;
 import io.reactivex.rxjava3.core.Single;
 import io.vertx.core.http.HttpMethod;
 import io.vertx.core.json.JsonObject;
@@ -40,6 +44,7 @@
 
 import java.util.Optional;
 
+import static io.gravitee.am.common.utils.ConstantKeys.CIBA_AUTH_REQUEST_KEY;
 import static org.springframework.util.StringUtils.hasText;
 
 /**
@@ -69,16 +74,30 @@ public class HttpAuthenticationDeviceNotifierProvider implements AuthenticationD
 
     @Override
     public Single<ADNotificationResponse> notify(ADNotificationRequest request) {
+
+        AuthenticationContext authenticationContext = new SimpleAuthenticationContext(request.getContext().get(CIBA_AUTH_REQUEST_KEY));
+        //removing context from request to not duplicate.
+        request.setContext(null);
+        authenticationContext.setAttribute("cibaRequest", request);
+        TemplateEngine templateEngine = authenticationContext.getTemplateEngine();
+
         LOGGER.debug("Call notifier service '{}' (tid: {}) ", this.configuration.getEndpoint(), request.getTransactionId());
 
         MultiMap formData = prepareFormData(request);
 
         final HttpRequest<Buffer> notificationRequest = this.client.requestAbs(HttpMethod.POST, this.configuration.getEndpoint());
         if (this.configuration.getHttpHeaders() != null && !this.configuration.getHttpHeaders().isEmpty()) {
-            notificationRequest.putHeaders(this.configuration.getHttpHeaders().stream()
-                    .collect(MultiMap::caseInsensitiveMultiMap,
-                            (map, header) -> map.add(header.getName(), header.getValue()),
-                            MultiMap::addAll));
+            MultiMap headers = MultiMap.caseInsensitiveMultiMap();
+            for (var header : this.configuration.getHttpHeaders()) {
+                try {
+                    String value = templateEngine.eval(header.getValue(), String.class).blockingGet();
+                    headers.add(header.getName(), value);
+                } catch (ExpressionEvaluationException e) {
+                    LOGGER.error("Failed to evaluate header '{}'", header.getName(), e);
+                    return Single.error(new DeviceNotificationException("Failed to evaluate header"));
+                }
+            }
+            notificationRequest.putHeaders(headers);
         }
         if (hasText(this.configuration.getHeaderValue())) {
             notificationRequest

diff --git a/...notifier/gravitee-am-authdevice-notifier-http/src/main/resources/schemas/schema-form.json b/...notifier/gravitee-am-authdevice-notifier-http/src/main/resources/schemas/schema-form.json
@@ -54,7 +54,7 @@
                     },
                     "value": {
                         "title": "Value",
-                        "description": "HTTP Header value",
+                        "description": "HTTP Header value (support EL)",
                         "type": "string"
                     }
                 },

diff --git a/...ee/am/gateway/handler/ciba/resources/handler/AuthenticationRequestAcknowledgeHandler.java b/...ee/am/gateway/handler/ciba/resources/handler/AuthenticationRequestAcknowledgeHandler.java
@@ -113,6 +113,7 @@ public void handle(RoutingContext context) {
                                         adRequest.setState(stateJwt);
                                         adRequest.setTransactionId(externalTrxId);
                                         adRequest.setDeviceNotifierId(authDeviceNotifierId);
+                                        adRequest.setContext(context);
 
                                         return authRequestService.notify(adRequest)
                                                 .flatMap(adResponse -> {

diff --git a/...app/domain/settings/openid/ciba/device-notifiers/device-notifier/form/form.component.scss b/...app/domain/settings/openid/ciba/device-notifiers/device-notifier/form/form.component.scss
@@ -5,3 +5,16 @@
 :host ::ng-deep mat-error {
   padding-left: 12px;
 }
+
+:host {
+  ::ng-deep {
+    fieldset {
+      flex-layout-root-widget {
+        display: initial !important;
+        max-height: 100% !important;
+        box-sizing: border-box !important;
+        flex-flow: column nowrap !important;
+      }
+    }
+  }
+}