From fe699be0f80874c07fbbb94a27dcc596a0d98ae8 Mon Sep 17 00:00:00 2001
From: bcfreitas <bcfreitas@gmail.com>
Date: Fri, 9 Dec 2016 13:17:19 -0300
Subject: [PATCH 1/2] Add files via upload

Added SSL self-signed certificate, listening on port 8443, for https development use.
---
 apis-authorization-server-war/pom.xml | 49 ++++++++++++++++++++++++---
 1 file changed, 44 insertions(+), 5 deletions(-)

diff --git a/apis-authorization-server-war/pom.xml b/apis-authorization-server-war/pom.xml
index f4adc635..914796bf 100644
--- a/apis-authorization-server-war/pom.xml
+++ b/apis-authorization-server-war/pom.xml
@@ -159,6 +159,11 @@
           <version>3.3.1</version>
       </dependency>
 
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty-ssl</artifactId>
+      <version>7.0.0.pre5</version>
+    </dependency>
   </dependencies>
 
   <profiles>
@@ -204,7 +209,7 @@
                 <extraClasspath>${basedir}/src/test/resources/</extraClasspath>
               </webAppConfig>
               <connectors>
-                <!--connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector"-->
+                <!--connector implementation="org.surfnet.oaaas.jetty.SelectChannelConnectorHttps"-->
                 <connector implementation="org.surfnet.oaaas.jetty.SelectChannelConnectorHttps">
                   <port>${servlet.port}</port>
                   <maxIdleTime>60000</maxIdleTime>
@@ -258,10 +263,8 @@
 
   </profiles>
 
-
   <build>
     <plugins>
-
       <!--
       Specific jetty-maven-plugin configuration for running Jetty during development.
       None of its goals are run in a normal build lifecycle.
@@ -312,11 +315,17 @@
             <extraClasspath>${basedir}/src/test/resources/</extraClasspath>
           </webAppConfig>
           <connectors>
-            <!--connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector"-->
+            <!--connector implementation="org.surfnet.oaaas.jetty.SelectChannelConnectorHttps"-->
             <connector implementation="org.surfnet.oaaas.jetty.SelectChannelConnectorHttps">
               <port>${servlet.port}</port>
               <host>0.0.0.0</host>
-            </connector>
+	    </connector>
+	    <connector implementation="org.eclipse.jetty.server.ssl.SslSocketConnector">
+		<port>8443</port>
+		<keystore>${project.basedir}/src/main/config/jetty-ssl.keystore</keystore>
+		<password>jetty8</password>
+		<keyPassword>jetty8</keyPassword>
+	    </connector>
           </connectors>
           <reload>manual</reload>
           <stopKey>stopauthserver</stopKey>
@@ -325,6 +334,36 @@
           <contextXml>${basedir}/src/test/resources/jetty-context.xml</contextXml>
         </configuration>
       </plugin>
+      <plugin>
+           <groupId>org.codehaus.mojo</groupId>
+           <artifactId>keytool-maven-plugin</artifactId>
+           <version>1.5</version>
+           <executions>
+             <execution>
+                <phase>generate-resources</phase>
+                <id>clean</id>
+                <goals>
+		   <goal>clean</goal>
+		</goals>
+	     </execution>
+	     <execution>
+                <phase>generate-resources</phase>
+                <id>generateKeyPair</id>
+                <goals>
+                   <goal>generateKeyPair</goal>
+                </goals>
+	     </execution>
+           </executions>
+           <configuration>
+              <keystore>${project.basedir}/src/main/config/jetty-ssl.keystore</keystore>
+	      <dname>cn=localhost</dname>
+		<!--Both `keypass` and `storepass` must be at least 6 characters long. -->
+		<keypass>jetty8</keypass>
+		<storepass>jetty8</storepass>
+		<alias>jetty8</alias>
+		<keyalg>RSA</keyalg>
+	    </configuration>
+	</plugin>
     </plugins>
   </build>
 </project>

From 42e1ea1d53866bc3bc82f765f04a5488811abc43 Mon Sep 17 00:00:00 2001
From: bcfreitas <bcfreitas@gmail.com>
Date: Fri, 9 Dec 2016 13:18:41 -0300
Subject: [PATCH 2/2] Add files via upload