remove unused code

1 files changed, 1 insertions, 243 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/AbstractAuthServletTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/AbstractAuthServletTask.java
index 66f91266f..68d5ae299 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/AbstractAuthServletTask.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/AbstractAuthServletTask.java
@@ -1,29 +1,17 @@
 package at.gv.egovernment.moa.id.auth.modules;

 

-import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.HEADER_CACHE_CONTROL;

-import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.HEADER_EXPIRES;

-import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.HEADER_PRAGMA;

-import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.HEADER_VALUE_CACHE_CONTROL;

-import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.HEADER_VALUE_CACHE_CONTROL_IE;

-import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.HEADER_VALUE_EXPIRES;

-import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.HEADER_VALUE_PRAGMA;

 import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.PARAM_TARGET_PENDINGREQUESTID;

 

 import java.io.ByteArrayOutputStream;

 import java.io.IOException;

 import java.io.InputStream;

-import java.util.Enumeration;

 import java.util.HashMap;

 import java.util.Iterator;

 import java.util.List;

 import java.util.Map;

 import java.util.Map.Entry;

 

-import javax.servlet.RequestDispatcher;

-import javax.servlet.ServletContext;

-import javax.servlet.ServletException;

 import javax.servlet.http.HttpServletRequest;

-import javax.servlet.http.HttpServletResponse;

 

 import org.apache.commons.fileupload.FileItem;

 import org.apache.commons.fileupload.FileItemFactory;

@@ -36,24 +24,16 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;

 

 import at.gv.egovernment.moa.id.advancedlogging.MOAReversionLogger;

-import at.gv.egovernment.moa.id.advancedlogging.StatisticLogger;

 import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;

 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;

-import at.gv.egovernment.moa.id.auth.exception.AuthenticationException;

 import at.gv.egovernment.moa.id.auth.exception.MOAIDException;

-import at.gv.egovernment.moa.id.auth.exception.WrongParametersException;

 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;

-import at.gv.egovernment.moa.id.config.ConfigurationException;

 import at.gv.egovernment.moa.id.config.auth.AuthConfiguration;

 import at.gv.egovernment.moa.id.moduls.IRequest;

 import at.gv.egovernment.moa.id.moduls.IRequestStorage;

 import at.gv.egovernment.moa.id.process.api.ExecutionContext;

 import at.gv.egovernment.moa.id.process.springweb.MoaIdTask;

-import at.gv.egovernment.moa.id.protocols.AbstractProtocolModulController;

 import at.gv.egovernment.moa.id.storage.IAuthenticationSessionStoreage;

-import at.gv.egovernment.moa.id.storage.ITransactionStorage;

-import at.gv.egovernment.moa.id.util.Random;

-import at.gv.egovernment.moa.id.util.ServletUtils;

 import at.gv.egovernment.moa.logging.Logger;

 import at.gv.egovernment.moa.util.MiscUtil;

 

@@ -63,8 +43,6 @@ import at.gv.egovernment.moa.util.MiscUtil;
  */

 public abstract class AbstractAuthServletTask extends MoaIdTask {

 

-	@Autowired private StatisticLogger statisticLogger;

-	@Autowired private ITransactionStorage transactionStorage;

 	@Autowired protected IRequestStorage requestStoreage;

 	@Autowired protected IAuthenticationSessionStoreage authenticatedSessionStorage;

 	@Autowired protected MOAReversionLogger revisionsLogger;

@@ -116,165 +94,6 @@ public abstract class AbstractAuthServletTask extends MoaIdTask {
 		}

 		

 	}

-	

-	protected void handleErrorNoRedirect(String errorMessage, Throwable exceptionThrown,

-			HttpServletRequest req, HttpServletResponse resp) {

-

-		if (null != errorMessage) {

-			Logger.error(errorMessage);

-			req.setAttribute("ErrorMessage", errorMessage);

-		}

-

-		if (null != exceptionThrown) {

-			if (null == errorMessage)

-				errorMessage = exceptionThrown.getMessage();

-			Logger.error(errorMessage, exceptionThrown);

-			req.setAttribute("ExceptionThrown", exceptionThrown);

-		}

-

-		if (Logger.isDebugEnabled()) {

-			req.setAttribute("LogLevel", "debug");

-		}

-		

-		statisticLogger.logErrorOperation(exceptionThrown);

-				

-		// forward this to errorpage-auth.jsp where the HTML error page is

-		// generated

-		ServletContext context = req.getServletContext();

-		RequestDispatcher dispatcher = context

-				.getRequestDispatcher("/errorpage-auth.jsp");

-		try {

-

-			resp.setHeader(HEADER_EXPIRES, HEADER_VALUE_EXPIRES);

-			resp.setHeader(HEADER_PRAGMA, HEADER_VALUE_PRAGMA);

-			resp.setHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL);

-			resp.addHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL_IE);

-

-			dispatcher.forward(req, resp);

-		} catch (ServletException e) {

-			Logger.error(e);

-		} catch (IOException e) {

-			Logger.error(e);

-		}

-	}

-	

-	/**

-	 * Handles an error. <br>>

-	 * <ul>

-	 * <li>Logs the error</li>

-	 * <li>Places error message and exception thrown into the request as request

-	 * attributes (to be used by <code>"/errorpage-auth.jsp"</code>)</li>

-	 * <li>Sets HTTP status 500 (internal server error)</li>

-	 * </ul>

-	 * 

-	 * @param errorMessage

-	 *            error message

-	 * @param exceptionThrown

-	 *            exception thrown

-	 * @param req

-	 *            servlet request

-	 * @param resp

-	 *            servlet response

-	 */

-	protected void handleError(String errorMessage, Throwable exceptionThrown,

-			HttpServletRequest req, HttpServletResponse resp, String pendingRequestID) {

-

-		if (null != errorMessage) {

-			Logger.error(errorMessage);

-			req.setAttribute("ErrorMessage", errorMessage);

-		}

-

-		if (null != exceptionThrown) {

-			if (null == errorMessage)

-				errorMessage = exceptionThrown.getMessage();

-			Logger.error(errorMessage, exceptionThrown);

-			req.setAttribute("ExceptionThrown", exceptionThrown);

-		}

-

-		if (Logger.isDebugEnabled()) {

-			req.setAttribute("LogLevel", "debug");

-		}

-

-		if (!(exceptionThrown instanceof MOAIDException)) {

-			Logger.error("Receive an internal error: Message=" + exceptionThrown.getMessage(), exceptionThrown);

-			

-		}

-				

-		

-		try {

-			String key = Random.nextRandom();			

-			transactionStorage.put(key, exceptionThrown);

-			

-			if (key != null && MiscUtil.isNotEmpty(pendingRequestID)) {		

-				String redirectURL = null;

-				

-				redirectURL = ServletUtils.getBaseUrl(req) + "/";

-				redirectURL += AbstractProtocolModulController.FINALIZEPROTOCOL_ENDPOINT 

-								+ "?" + ERROR_CODE_PARAM + "=" + key 

-						+ "&" + MOAIDAuthConstants.PARAM_TARGET_PENDINGREQUESTID + "=" + pendingRequestID;

-			

-				resp.setContentType("text/html");

-				resp.setStatus(302);

-		

-				resp.addHeader("Location", redirectURL);		

-				Logger.debug("REDIRECT TO: " + redirectURL);	

-					

-				return;

-				

-			} else {				

-				//Exception can not be stored in database

-				handleErrorNoRedirect(errorMessage, exceptionThrown, req, resp);

-			}

-						

-		} catch (MOADatabaseException e) {

-			Logger.warn("Exception can not be stored to Database.", e);

-			handleErrorNoRedirect(errorMessage, exceptionThrown, req, resp);

-			

-		}

-

-

-			

-

-	}

-

-	/**

-	 * Handles a <code>WrongParametersException</code>.

-	 * 

-	 * @param req

-	 *            servlet request

-	 * @param resp

-	 *            servlet response

-	 */

-	protected void handleWrongParameters(WrongParametersException ex,

-			HttpServletRequest req, HttpServletResponse resp) {

-		Logger.error(ex.toString());

-		req.setAttribute("WrongParameters", ex.getMessage());

-

-		// forward this to errorpage-auth.jsp where the HTML error page is

-		// generated

-		ServletContext context = req.getServletContext();

-		RequestDispatcher dispatcher = context

-				.getRequestDispatcher("/errorpage-auth.jsp");

-		try {

-			setNoCachingHeaders(resp);

-			dispatcher.forward(req, resp);

-		} catch (ServletException e) {

-			Logger.error(e);

-		} catch (IOException e) {

-			Logger.error(e);

-		}

-	}

-

-	/**

-	 * Logs all servlet parameters for debugging purposes.

-	 */

-	protected void logParameters(HttpServletRequest req) {

-		for (Enumeration params = req.getParameterNames(); params

-				.hasMoreElements();) {

-			String parname = (String) params.nextElement();

-			Logger.debug("Parameter " + parname + req.getParameter(parname));

-		}

-	}

 

 	/**

 	 * Parses the request input stream for parameters, assuming parameters are

@@ -334,27 +153,7 @@ public abstract class AbstractAuthServletTask extends MoaIdTask {
 			}

 		}

 

-		else {

-			// request is encoded as application/x-www-urlencoded

-			// [tknall]: we must not consume request body input stream once servlet-api request parameters have been accessed

-			

-			/*

-			InputStream in = req.getInputStream();

-

-			String paramName;

-			String paramValueURLEncoded;

-			do {

-				paramName = new String(readBytesUpTo(in, '='));

-				if (paramName.length() > 0) {

-					paramValueURLEncoded = readBytesUpTo(in, '&');

-					String paramValue = URLDecoder.decode(paramValueURLEncoded,

-							"UTF-8");

-					parameters.put(paramName, paramValue);

-				}

-			} while (paramName.length() > 0);

-			in.close();

-			*/

-			

+		else {	

 			Iterator<Entry<String, String[]>> requestParamIt = req.getParameterMap().entrySet().iterator();

 			while (requestParamIt.hasNext()) {

 				Entry<String, String[]> entry = requestParamIt.next();

@@ -394,19 +193,6 @@ public abstract class AbstractAuthServletTask extends MoaIdTask {
 	}

 

 	/**

-	 * Sets response headers that prevent caching (code taken from {@link AuthServlet}).

-	 * 

-	 * @param resp

-	 *            The HttpServletResponse.

-	 */

-	public void setNoCachingHeaders(HttpServletResponse resp) {

-		resp.setHeader(HEADER_EXPIRES, HEADER_VALUE_EXPIRES);

-		resp.setHeader(HEADER_PRAGMA, HEADER_VALUE_PRAGMA);

-		resp.setHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL);

-		resp.addHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL_IE);

-	}

-

-	/**

 	 * Adds a parameter to a URL.

 	 * 

 	 * @param url

@@ -425,32 +211,4 @@ public abstract class AbstractAuthServletTask extends MoaIdTask {
 		else

 			return url + "&" + param;

 	}

-

-	/**

-	 * Checks if HTTP requests are allowed

-	 * 

-	 * @param authURL

-	 *            requestURL

-	 * @throws AuthenticationException

-	 *             if HTTP requests are not allowed

-	 * @throws ConfigurationException

-	 */

-	protected void checkIfHTTPisAllowed(String authURL)

-			throws AuthenticationException, ConfigurationException {

-		// check if HTTP Connection may be allowed (through

-		// FRONTEND_SERVLETS_ENABLE_HTTP_CONNECTION_PROPERTY)

-		

-		//Removed from MOA-ID 2.0 config

-//		String boolStr = AuthConfigurationProvider

-//				.getInstance()

-//				.getGenericConfigurationParameter(

-//						AuthConfigurationProvider.FRONTEND_SERVLETS_ENABLE_HTTP_CONNECTION_PROPERTY);

-		if ((!authURL.startsWith("https:"))

-				//&& (false == BoolUtils.valueOf(boolStr))

-				)

-			throw new AuthenticationException("auth.07", new Object[] { authURL

-					+ "*" });

-

-	}

-

 }