From c55a1fe209b10432686d662f5c8c571f3a8c2564 Mon Sep 17 00:00:00 2001
From: Bradley Johnson <Bradley.Johnson@mindgeek.com>
Date: Fri, 23 Nov 2018 16:19:05 -0500
Subject: [PATCH] OpenID Connect Server working with local MySQL instance

---
 openid-connect-server-webapp/pom.xml          | 11 ++++
 .../src/main/webapp/WEB-INF/data-context.xml  | 54 +++++++++----------
 .../src/main/webapp/WEB-INF/tags/topbar.tag   |  2 +-
 .../src/main/webapp/WEB-INF/user-context.xml  |  2 +-
 4 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/openid-connect-server-webapp/pom.xml b/openid-connect-server-webapp/pom.xml
index 9a4c45bc3d..8c3911ed4e 100644
--- a/openid-connect-server-webapp/pom.xml
+++ b/openid-connect-server-webapp/pom.xml
@@ -83,6 +83,10 @@
 					<webAppConfig>
 						<contextPath>/openid-connect-server-webapp</contextPath>
 					</webAppConfig>
+                                          <httpConnector>
+                                            <!--host>localhost</host-->
+                                            <port>8080</port>
+                                          </httpConnector>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -147,6 +151,13 @@
 			<groupId>com.zaxxer</groupId>
 			<artifactId>HikariCP</artifactId>
 		</dependency>
+                
+                <!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
+                <dependency>
+                    <groupId>mysql</groupId>
+                    <artifactId>mysql-connector-java</artifactId>
+                    <version>5.1.6</version>
+                </dependency>
 	</dependencies>
 	<description>Deployable package of the OpenID Connect server</description>
 </project>
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/data-context.xml b/openid-connect-server-webapp/src/main/webapp/WEB-INF/data-context.xml
index 67d8bd146b..02a2988c8e 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/data-context.xml
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/data-context.xml
@@ -22,56 +22,56 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
        						http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-4.3.xsd">
 
-	<bean id="dataSource" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
+<!--	<bean id="dataSource" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
 		<property name="driverClassName" value="org.hsqldb.jdbcDriver" />
 		<property name="jdbcUrl" value="jdbc:hsqldb:mem:oic;sql.syntax_mys=true" />
-<!-- 		<property name="jdbcUrl" value="jdbc:hsqldb:file:/tmp/oic;sql.syntax_mys=true" /> -->
+ 		<property name="jdbcUrl" value="jdbc:hsqldb:file:/tmp/oic;sql.syntax_mys=true" /> 
 		<property name="username" value="oic" />
 		<property name="password" value="oic" />
-	</bean>
+	</bean>-->
 
 	<!-- Use the following to set up the OIC tables in the in-memory DB
  		   If you are using a file based HSQLDB you should not run this every time. -->
-	<jdbc:initialize-database data-source="dataSource">
+<!--	<jdbc:initialize-database data-source="dataSource">
 		<jdbc:script location="classpath:/db/hsql/hsql_database_tables.sql"/>
-		<!-- The following file is for the jdbc-user-service spring security implementation -->
+		 The following file is for the jdbc-user-service spring security implementation 
 		<jdbc:script location="classpath:/db/hsql/security-schema.sql"/>
-		<!-- The following files are for safely bootstrapping users and clients into the database -->
+		 The following files are for safely bootstrapping users and clients into the database 
 		<jdbc:script location="classpath:/db/hsql/loading_temp_tables.sql"/>
 		<jdbc:script location="classpath:/db/hsql/users.sql"/>
 		<jdbc:script location="classpath:/db/hsql/clients.sql"/>
 		<jdbc:script location="classpath:/db/hsql/scopes.sql"/>
-	</jdbc:initialize-database>
+	</jdbc:initialize-database>-->
 
-	<bean id="jpaAdapter" class="org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter">
+<!--	<bean id="jpaAdapter" class="org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter">
  		<property name="databasePlatform" value="org.eclipse.persistence.platform.database.HSQLPlatform" />
 		<property name="showSql" value="true" />
-	</bean>
+	</bean>-->
 
 	<!--  The following is for connecting to a MySQL database that has been initialized with 
 			src/main/resources/db/mysql/mysql_database_tables.sql -->
-<!-- 	<bean id="dataSource" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close"> -->
-<!-- 		<property name="driverClassName" value="com.mysql.jdbc.Driver" /> -->
-<!-- 		<property name="jdbcUrl" value="jdbc:mysql://127.0.0.1:3306/oic" /> -->
-<!-- 		<property name="username" value="oic" /> -->
-<!-- 		<property name="password" value="oic" /> -->
-<!--  	</bean> -->
+ 	<bean id="dataSource" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close"> 
+ 		<property name="driverClassName" value="com.mysql.jdbc.Driver" /> 
+ 		<property name="jdbcUrl" value="jdbc:mysql://127.0.0.1:3306/oic" /> 
+ 		<property name="username" value="root" /> 
+ 		<property name="password" value="santa" /> 
+  	</bean> 
 
-<!-- 	<bean id="jpaAdapter" class="org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter"> -->
-<!-- 		<property name="databasePlatform" value="org.eclipse.persistence.platform.database.MySQLPlatform" /> -->
-<!-- 		<property name="showSql" value="true" /> -->
-<!-- 	</bean> -->
+ 	<bean id="jpaAdapter" class="org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter"> 
+ 		<property name="databasePlatform" value="org.eclipse.persistence.platform.database.MySQLPlatform" /> 
+ 		<property name="showSql" value="true" /> 
+ 	</bean> 
 
 	<!-- You can optionally initialize the database with test values here, 
 		but this is not recommended for real systems -->
-<!-- 	<jdbc:initialize-database data-source="dataSource"> -->
-<!-- 		<jdbc:script location="classpath:/db/tables/mysql_database_tables.sql"/> -->
-<!-- 		<jdbc:script location="classpath:/db/tables/security-schema.sql"/> -->
-<!-- 		<jdbc:script location="classpath:/db/tables/loading_temp_tables.sql"/> -->
-<!-- 		<jdbc:script location="classpath:/db/mysql/users.sql"/> -->
-<!-- 		<jdbc:script location="classpath:/db/mysql/clients.sql"/> -->
-<!-- 		<jdbc:script location="classpath:/db/mysql/scopes.sql"/> -->
-<!-- 	</jdbc:initialize-database> -->
+<!-- 	<jdbc:initialize-database data-source="dataSource"> 
+ 		<jdbc:script location="classpath:/db/tables/mysql_database_tables.sql"/> 
+ 		<jdbc:script location="classpath:/db/tables/security-schema.sql"/> 
+ 		<jdbc:script location="classpath:/db/tables/loading_temp_tables.sql"/> 
+ 		<jdbc:script location="classpath:/db/mysql/users.sql"/> 
+ 		<jdbc:script location="classpath:/db/mysql/clients.sql"/> 
+ 		<jdbc:script location="classpath:/db/mysql/scopes.sql"/> 
+ 	</jdbc:initialize-database> -->
 
 	<!--  The following is for connecting to a PostgreSQL database that has been initialized with
 			src/main/resources/db/psql/psql_database_tables.sql -->
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag
index 1bce4a1c5f..e870c33576 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag
@@ -104,4 +104,4 @@
 			$('#logoutForm').submit();
 		});
 	});
-</script>
\ No newline at end of file
+</script>
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/user-context.xml b/openid-connect-server-webapp/src/main/webapp/WEB-INF/user-context.xml
index 2aff943637..5e5eca4298 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/user-context.xml
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/user-context.xml
@@ -51,7 +51,7 @@
 		<security:headers>
 			<security:frame-options policy="DENY" />
 		</security:headers>
-		<security:csrf />
+		<security:csrf disabled="true"/>
 	</security:http>	
 
 </beans>