CXF-8121 Improve STS REST interface

services/sts/pom.xml

@@ -32,6 +32,7 @@
     </parent>
     <modules>
         <module>sts-core</module>
+        <module>sts-rest</module>
         <module>systests</module>
     </modules>
 </project>

services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java

@@ -69,7 +69,7 @@ public class RESTSecurityTokenServiceImpl extends SecurityTokenServiceImpl imple
     public static final Map<String, String> DEFAULT_CLAIM_TYPE_MAP;
     public static final Map<String, String> DEFAULT_TOKEN_TYPE_MAP;
 
-    private static final Map<String, String> DEFAULT_KEY_TYPE_MAP = new HashMap<>();
+    public static final Map<String, String> DEFAULT_KEY_TYPE_MAP = new HashMap<>();
 
     private static final String CLAIM_TYPE = "ClaimType";
     private static final String CLAIM_TYPE_NS = "http://schemas.xmlsoap.org/ws/2005/05/identity";
@@ -402,6 +402,14 @@ public void setUseDeflateEncoding(boolean deflate) {
         useDeflateEncoding = deflate;
     }
 
+    public void setMessageContext(MessageContext messageContext) {
+        this.messageContext = messageContext;
+    }
+
+    public void setSecurityContext(javax.ws.rs.core.SecurityContext securityContext) {
+        this.securityContext = securityContext;
+    }
+
     protected String encodeToken(String assertion) throws Base64Exception {
         byte[] tokenBytes = assertion.getBytes(StandardCharsets.UTF_8);
 

services/sts/sts-rest/pom.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.cxf.services.sts</groupId>
+    <artifactId>cxf-services-sts-rest</artifactId>
+    <packaging>bundle</packaging>
+    <name>Apache CXF STS REST</name>
+    <url>https://cxf.apache.org</url>
+    <parent>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-parent</artifactId>
+        <version>3.4.0-SNAPSHOT</version>
+        <relativePath>../../../parent/pom.xml</relativePath>
+    </parent>
+    <properties>
+        <cxf.module.name>org.apache.cxf.sts.rest</cxf.module.name>
+        <cxf.osgi.import>
+            javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
+            !org.apache.cxf.sts.*,
+            org.apache.cxf.*,
+            org.springframework.ldap*;resolution:=optional,
+            net.sf.ehcache*;resolution:=optional;version="[2.5, 3.0.0)",
+            org.opensaml*;version="${cxf.opensaml.osgi.version.range}",
+            javax.xml.bind;version="${cxf.osgi.javax.bind.version}"
+        </cxf.osgi.import>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.cxf.services.sts</groupId>
+            <artifactId>cxf-services-sts-core</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-rs-service-description-openapi-v3</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.validation</groupId>
+                    <artifactId>validation-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-rs-security-jose-jaxrs</artifactId>
+        </dependency>
+    </dependencies>
+</project>

services/sts/sts-rest/src/main/java/org/apache/cxf/sts/rest/api/BaseResponse.java

@@ -0,0 +1,80 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.sts.rest.api;
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * Base class for STS REST interface responses
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "BaseResponse", propOrder = {
+        "status",
+        "message"
+})
+@XmlRootElement(name = "BaseResponse")
+public class BaseResponse implements Serializable {
+    private static final long serialVersionUID = 100L;
+
+    public enum StatusType {
+        // The service call has been successful
+        SUCCESS,
+        // The service call has been failed.
+        ERROR;
+    }
+
+    @XmlElement(required = true)
+    String status;
+
+    @XmlElement
+    String message;
+
+    public BaseResponse() {
+        this.status = StatusType.SUCCESS.name();
+    }
+
+    public BaseResponse(final StatusType status, final String message) {
+        this.status = status.name();
+        this.message = message;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}
+
+

services/sts/sts-rest/src/main/java/org/apache/cxf/sts/rest/api/GetTokenRequest.java

@@ -0,0 +1,85 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.sts.rest.api;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * Class describes request model for getTokenExchange and getToken endpoints
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "TokenRequest")
+@XmlRootElement(name = "TokenRequest")
+public class GetTokenRequest implements Serializable {
+    private static final long serialVersionUID = 100L;
+
+    @XmlElement(required = true)
+    private String tokenType;
+
+    @XmlElement(required = true)
+    private String keyType;
+
+    @XmlElement(required = true)
+    private List<String> claims = new ArrayList();
+
+    @XmlElement
+    private String audience;
+
+    public String getTokenType() {
+        return tokenType;
+    }
+
+    public void setTokenType(String tokenType) {
+        this.tokenType = tokenType;
+    }
+
+    public List<String> getClaims() {
+        return claims;
+    }
+
+    public void setClaims(List<String> claims) {
+        this.claims = claims;
+    }
+
+    public String getAudience() {
+        return audience;
+    }
+
+    public void setAudience(String audience) {
+        this.audience = audience;
+    }
+
+    public String getKeyType() {
+        return keyType;
+    }
+
+    public void setKeyType(String keyType) {
+        this.keyType = keyType;
+    }
+}
+
+