From 43f633a0b7ed8cfd73fce79560627fd5040abcc8 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Thu, 22 Apr 2021 15:02:54 +0200
Subject: remove code for MOA-ID 1.x proxy

---
 id/server/proxy/pom.xml                            | 152 ---------------------
 .../proxy/src/main/webapp/META-INF/MANIFEST.MF     |   2 -
 id/server/proxy/src/main/webapp/WEB-INF/web.xml    |  82 -----------
 .../proxy/src/main/webapp/errorpage-proxy.jsp      |  50 -------
 id/server/proxy/src/main/webapp/message-proxy.jsp  |  20 ---
 5 files changed, 306 deletions(-)
 delete mode 100644 id/server/proxy/pom.xml
 delete mode 100644 id/server/proxy/src/main/webapp/META-INF/MANIFEST.MF
 delete mode 100644 id/server/proxy/src/main/webapp/WEB-INF/web.xml
 delete mode 100644 id/server/proxy/src/main/webapp/errorpage-proxy.jsp
 delete mode 100644 id/server/proxy/src/main/webapp/message-proxy.jsp

diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
deleted file mode 100644
index 4a18f6b2e..000000000
--- a/id/server/proxy/pom.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<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">
-	<parent>
-		<groupId>MOA.id</groupId>
-		<artifactId>moa-id</artifactId>
-		<version>4.0.1-snapshot</version>
-	</parent>
-	
-	<properties>
-		<repositoryPath>${basedir}/../../../repository</repositoryPath>
-	</properties>
-	
-	<repositories>
-		<repository>
-			<id>shibboleth.internet2.edu</id>
-			<name>Internet2</name>
-			<url>https://apps.egiz.gv.at/shibboleth_nexus/</url>
-		</repository>
-	</repositories>
-	
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>MOA.id.server</groupId>
-	<artifactId>moa-id-proxy</artifactId>
-	<version>${moa-id-proxy-version}</version>
-	<packaging>war</packaging>
-	<name>MOA ID-Proxy WebService</name>
-	
-	<build>
-		<plugins>
-<!-- 				        <plugin>
-            		<groupId>org.codehaus.mojo</groupId>
-            		<artifactId>properties-maven-plugin</artifactId>
-            		<version>1.0-alpha-2</version>
-            		<executions>
-                		<execution>
-                    		<phase>initialize</phase>
-                    		<goals>
-                        		<goal>read-project-properties</goal>
-                    		</goals>
-                    		<configuration>
-    	                   		<files>
-		                            <file>${basedir}/../../../moa-id.properties</file>
-      		                  </files>
-          		          </configuration>
-              		  </execution>
-            		</executions>
-        		</plugin> -->
-		
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>2.1.1</version>
-				<!-- <version>2.0.2</version>-->
-				<configuration>
-					<archive>
-						<manifest>
-							<addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
-							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-						</manifest>
-						<addMavenDescriptor>false</addMavenDescriptor>
-					</archive>
-<!--
-					<webResources>
-						<resource>
-							<directory>${basedir}/../resources</directory>
-							<targetPath>WEB-INF/classes/resources</targetPath>
-						</resource>
-						<resource>
-							<directory>${basedir}/../services</directory>
-							<targetPath>WEB-INF/classes/META-INF/services</targetPath>
-						</resource>
-					</webResources>
--->
-				</configuration>
-			</plugin>
-      <plugin>
-	      <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-  	      <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-		</plugins>
-	</build>
-
-	<dependencies>
-		<!-- we need Axis 1.1 here, 1.0 is included in SPSS -->
-		<dependency>
-			<groupId>axis</groupId>
-			<artifactId>axis</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>MOA.spss.server</groupId>
-			<artifactId>moa-spss-lib</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>MOA.id.server</groupId>
-			<artifactId>moa-id-lib</artifactId>
-			<!--version>${project.version}</version-->
-		</dependency>
-		<!-- transitive dependencies we don't want to include into the war -->
-		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_jce_full</artifactId>
-			<!-- should be in the ext directory of the jre -->
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_ecc</artifactId>
-			<!-- should be in the ext directory of the jre -->
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_Pkcs11Provider</artifactId>
-			<!-- should be in the ext directory of the jre -->
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_Pkcs11Wrapper</artifactId>
-			<!-- should be in the ext directory of the jre -->
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>xalan-bin-dist</groupId>
-			<artifactId>xalan</artifactId>
-			<!-- should be provided by the container or jre -->
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>xerces</groupId>
-			<artifactId>xercesImpl</artifactId>
-			<!-- should be provided by the container or jre -->
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>xalan-bin-dist</groupId>
-			<artifactId>xml-apis</artifactId>
-			<!-- should be provided by the container or jre -->
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>xalan-bin-dist</groupId>
-			<artifactId>serializer</artifactId>
-			<!-- should be provided by the container or jre -->
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
-
-</project>
diff --git a/id/server/proxy/src/main/webapp/META-INF/MANIFEST.MF b/id/server/proxy/src/main/webapp/META-INF/MANIFEST.MF
deleted file mode 100644
index 58630c02e..000000000
--- a/id/server/proxy/src/main/webapp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/id/server/proxy/src/main/webapp/WEB-INF/web.xml b/id/server/proxy/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 57926f207..000000000
--- a/id/server/proxy/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN' 'http://java.sun.com/dtd/web-app_2_3.dtd'>
-<web-app>
-	<display-name>MOA ID Proxy</display-name>
-	<description>MOA ID Proxy Service</description>
-
-	<filter>
-		<filter-name>ParameterInOrder Filter</filter-name>
-		<filter-class>at.gv.egovernment.moa.id.util.ParameterInOrderFilter</filter-class>
-	</filter>
-	<filter-mapping>
-		<filter-name>ParameterInOrder Filter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-
-	<servlet>
-		<servlet-name>Proxy</servlet-name>
-		<display-name>Proxy</display-name>
-		<description>Forwards requests to the online application</description>
-		<servlet-class>at.gv.egovernment.moa.id.proxy.servlet.ProxyServlet</servlet-class>
-		<load-on-startup>0</load-on-startup>
-	</servlet>
-	<servlet>
-		<servlet-name>ConfigurationUpdate</servlet-name>
-		<display-name>ConfigurationUpdate</display-name>
-		<description>Update MOA-ID Proxy configuration from the configuration file</description>
-		<servlet-class>at.gv.egovernment.moa.id.proxy.servlet.ConfigurationServlet</servlet-class>
-	</servlet>
-	
-	<!-- JSP servlet -->
-	<servlet>
-        <servlet-name>jspservlet</servlet-name>
-        <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
-    </servlet>
-    
-	<!-- servlet mapping for jsp pages -->
-	<!-- errorpage.jsp (customizeable) -->
-	<servlet-mapping>
-        <servlet-name>jspservlet</servlet-name>
-        <url-pattern>/errorpage-proxy.jsp</url-pattern>
-    </servlet-mapping>		
-    <!-- message-proxy.jsp (customizeable) used for non error messages (e.g. ConfigurationUpdate) -->
-	<servlet-mapping>
-        <servlet-name>jspservlet</servlet-name>
-        <url-pattern>/message-proxy.jsp</url-pattern>
-    </servlet-mapping>		
-
-	<servlet-mapping>
-		<servlet-name>ConfigurationUpdate</servlet-name>
-		<url-pattern>/ConfigurationUpdate</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>Proxy</servlet-name>
-		<url-pattern>/*</url-pattern>
-	</servlet-mapping>
-	<session-config>
-		<session-timeout>30</session-timeout>
-	</session-config>
-	<error-page>
-		<error-code>500</error-code>
-		<location>/errorpage-proxy.jsp</location>
-	</error-page>
-	<security-constraint>
-		<web-resource-collection>
-			<web-resource-name>ConfigurationUpdate</web-resource-name>
-			<url-pattern>/ConfigurationUpdate</url-pattern>
-		</web-resource-collection>
-		<auth-constraint>
-			<role-name>moa-admin</role-name>
-		</auth-constraint>
-	</security-constraint>
-	<login-config>
-		<auth-method>BASIC</auth-method>
-		<realm-name>UserDatabase</realm-name>
-	</login-config>
-	<security-role>
-		<description>
-		    The role that is required to log in to the moa Application
-  		</description>
-		<role-name>moa-admin</role-name>
-	</security-role>
-</web-app>
diff --git a/id/server/proxy/src/main/webapp/errorpage-proxy.jsp b/id/server/proxy/src/main/webapp/errorpage-proxy.jsp
deleted file mode 100644
index 07f3e7f69..000000000
--- a/id/server/proxy/src/main/webapp/errorpage-proxy.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<%@ page contentType="text/html; charset=UTF-8" %>
-<html>
-<head>
-<title>Ein Fehler ist aufgetreten</title>
-</head>
-<% Throwable exceptionThrown = (Throwable)request.getAttribute("ExceptionThrown");
-   String errorMessage = (String)request.getAttribute("ErrorMessage");
-   String wrongParameters = (String)request.getAttribute("WrongParameters");
-%>
-
-<body>
-<h1>Fehler bei der Anmeldung</h1>
-<p>Bei der Anmeldung ist ein Fehler aufgetreten.</p>
-
-<% if (errorMessage != null) { %>
-<p>
-<%= errorMessage%><br>
-</p>
-<% } %>
-<% if (exceptionThrown != null) { %>
-<p> 
-<%= exceptionThrown.getMessage()%>
-</p>
-<% } %>
-<% if (wrongParameters != null) { %>
-<p>Die Angabe der Parameter ist unvollst&auml;ndig.<br></p>
-<b> <%= wrongParameters %> </b><br>
-<p>
-   Beispiele f&uuml;r korrekte Links zur MOA-ID Authentisierung sind:
-</p>
-<p>
-<tt>&lt;a href="https://&lt;MOA-URL&gt;/StartAuthentication?Target=&lt;Gesch&auml;ftsbereich&gt;&amp;OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&quot;&gt;</tt>
-</p>
-<p>
-<tt>&lt;a href="https://&lt;MOA-URL&gt;/SelectBKU?Target=&lt;Gesch&auml;ftsbereich&gt;&amp;OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&amp;BKUSelectionTemplate=&lt;BKU-Template-URL&gt;&quot;&gt;</tt>
-</p>
-<p>
-Im Falle einer Applikation aus dem privatwirtschaftlichen Bereich (type="businessService") entf&auml;llt die Angabe des <i>Target</i> Parameters:
-</p>
-<p>
-<tt>&lt;a href="https://&lt;MOA-URL&gt;/StartAuthentication?OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&quot;&gt;</tt>
-</p>
-<p>
-<tt>&lt;a href="https://&lt;MOA-URL&gt;/SelectBKU?OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&amp;BKUSelectionTemplate=&lt;BKU-Template-URL&gt;&quot;&gt;</tt>
-</p>
-<p>Die Angabe der Parameter <tt>&quot;Template&quot;</tt> und <tt>&quot;BKUSelectionTemplate&quot;</tt> ist optional.</p>
-<% } %>
-</body>
-</html>
\ No newline at end of file
diff --git a/id/server/proxy/src/main/webapp/message-proxy.jsp b/id/server/proxy/src/main/webapp/message-proxy.jsp
deleted file mode 100644
index 0d970898a..000000000
--- a/id/server/proxy/src/main/webapp/message-proxy.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<%@ page contentType="text/html; charset=UTF-8" %>
-<html>
-<head>
-<title>MOA-ID Proxy</title>
-</head>
-<% String message = (String)request.getAttribute("Message");
-%>
-
-<body>
-<h1>MOA-ID Proxy</h1>
-
-<% if (message != null) { %>
-<p>
-<%= message%><br>
-</p>
-<% } %>
-
-</body>
-</html>
\ No newline at end of file
-- 
cgit v1.2.3