aboutsummaryrefslogtreecommitdiff
path: root/id/server/idserverlib/src/main/java/at/gv/egovernment/moa
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2016-02-25 07:20:48 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2016-02-25 07:20:48 +0100
commit14b1e1a2840a210754ac063ee3aa0b6884bf6ce9 (patch)
treeedf13da27033be1aebe23104f714dea2612abc00 /id/server/idserverlib/src/main/java/at/gv/egovernment/moa
parentf8b9d30b9c1b25b5e92bbb488394e41dbe8be7f1 (diff)
downloadmoa-id-spss-14b1e1a2840a210754ac063ee3aa0b6884bf6ce9.tar.gz
moa-id-spss-14b1e1a2840a210754ac063ee3aa0b6884bf6ce9.tar.bz2
moa-id-spss-14b1e1a2840a210754ac063ee3aa0b6884bf6ce9.zip
change PVP code to make it more reusable
Diffstat (limited to 'id/server/idserverlib/src/main/java/at/gv/egovernment/moa')
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractProcessEngineSignalController.java2
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/IDPCredentialProvider.java43
2 files changed, 37 insertions, 8 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractProcessEngineSignalController.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractProcessEngineSignalController.java
index 8b96b884e..6be0fce90 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractProcessEngineSignalController.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractProcessEngineSignalController.java
@@ -23,7 +23,7 @@ import at.gv.egovernment.moa.logging.Logger;
*/
public abstract class AbstractProcessEngineSignalController extends AbstractController {
- @Autowired ProcessEngine processEngine;
+ @Autowired protected ProcessEngine processEngine;
protected void signalProcessManagement(HttpServletRequest req, HttpServletResponse resp) throws IOException {
String pendingRequestID = StringEscapeUtils.escapeHtml(getPendingRequestId(req));
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/IDPCredentialProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/IDPCredentialProvider.java
index 8fb4ec3cf..abc4eb4a9 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/IDPCredentialProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/IDPCredentialProvider.java
@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service;
import at.gv.egovernment.moa.id.config.auth.AuthConfiguration;
import at.gv.egovernment.moa.util.FileUtils;
+import at.gv.egovernment.moa.util.MiscUtil;
@Service("IDPCredentialProvider")
public class IDPCredentialProvider extends AbstractCredentialProvider {
@@ -70,7 +71,11 @@ public class IDPCredentialProvider extends AbstractCredentialProvider {
if (props == null)
props = authConfig.getGeneralPVP2ProperiesConfig();
- return props.getProperty(IDP_KS_PASS).trim();
+ String value = props.getProperty(IDP_KS_PASS);
+ if (MiscUtil.isNotEmpty(value))
+ return value.trim();
+ else
+ return null;
}
/* (non-Javadoc)
@@ -81,7 +86,11 @@ public class IDPCredentialProvider extends AbstractCredentialProvider {
if (props == null)
props = authConfig.getGeneralPVP2ProperiesConfig();
- return props.getProperty(IDP_KEYALIASMETADATA).trim();
+ String value = props.getProperty(IDP_KEYALIASMETADATA);
+ if (MiscUtil.isNotEmpty(value))
+ return value.trim();
+ else
+ return null;
}
/* (non-Javadoc)
@@ -92,7 +101,11 @@ public class IDPCredentialProvider extends AbstractCredentialProvider {
if (props == null)
props = authConfig.getGeneralPVP2ProperiesConfig();
- return props.getProperty(IDP_KEY_PASSMETADATA).trim();
+ String value = props.getProperty(IDP_KEY_PASSMETADATA);
+ if (MiscUtil.isNotEmpty(value))
+ return value.trim();
+ else
+ return null;
}
/* (non-Javadoc)
@@ -103,7 +116,11 @@ public class IDPCredentialProvider extends AbstractCredentialProvider {
if (props == null)
props = authConfig.getGeneralPVP2ProperiesConfig();
- return props.getProperty(IDP_KEYALIASASSERTION).trim();
+ String value = props.getProperty(IDP_KEYALIASASSERTION);
+ if (MiscUtil.isNotEmpty(value))
+ return value.trim();
+ else
+ return null;
}
/* (non-Javadoc)
@@ -114,7 +131,11 @@ public class IDPCredentialProvider extends AbstractCredentialProvider {
if (props == null)
props = authConfig.getGeneralPVP2ProperiesConfig();
- return props.getProperty(IDP_KEY_PASSASSERTION).trim();
+ String value = props.getProperty(IDP_KEY_PASSASSERTION);
+ if (MiscUtil.isNotEmpty(value))
+ return value.trim();
+ else
+ return null;
}
/* (non-Javadoc)
@@ -125,7 +146,11 @@ public class IDPCredentialProvider extends AbstractCredentialProvider {
if (props == null)
props = authConfig.getGeneralPVP2ProperiesConfig();
- return props.getProperty(IDP_KEYALIASENCRYTPION).trim();
+ String value = props.getProperty(IDP_KEYALIASENCRYTPION);
+ if (MiscUtil.isNotEmpty(value))
+ return value.trim();
+ else
+ return null;
}
/* (non-Javadoc)
@@ -136,7 +161,11 @@ public class IDPCredentialProvider extends AbstractCredentialProvider {
if (props == null)
props = authConfig.getGeneralPVP2ProperiesConfig();
- return props.getProperty(IDP_KEYALIASENCRYTPION).trim();
+ String value = props.getProperty(IDP_KEY_PASSENCRYTPION);
+ if (MiscUtil.isNotEmpty(value))
+ return value.trim();
+ else
+ return null;
}
/* (non-Javadoc)