aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java17
-rw-r--r--spss/handbook/clients/api/moa-spss-handbook-apiClient.iml1
-rw-r--r--spss/handbook/clients/webservice/moa-spss-handbook-webserviceClient.iml1
-rw-r--r--spss/server/serverlib/moa-spss-lib.iml2
4 files changed, 5 insertions, 16 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
index 5e9d50221..a361d5f67 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
@@ -1,6 +1,5 @@
package at.gv.egovernment.moa.id.protocols.stork2;
-import at.gv.egovernment.moa.id.auth.AuthenticationServer;
import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
import at.gv.egovernment.moa.id.moduls.IAction;
@@ -105,20 +104,6 @@ public class STORKProtocol implements IModulInfo, MOAIDAuthConstants {
authnRequest = authnEngine.validateSTORKAuthnRequest(decSamlToken);
} catch (STORKSAMLEngineException ex) {
Logger.error("Unable to validate Stork AuthenticationRequest: " + ex.getMessage());
-<<<<<<< HEAD
- } catch (ClassCastException e) {
- Logger.error("Could not extract authenticaiton request");
- }
-
-
- // check if a valid attr request is containerd
- try {
- attrRequest = attrEngine.validateSTORKAttrQueryRequest(decSamlToken);
- } catch (STORKSAMLEngineException ex) {
- Logger.error("Unable to validate Stork AuthenticationRequest: " + ex.getMessage());
- } catch (ClassCastException e) {
- Logger.error("Could not extract attribute request");
-=======
} catch(ClassCastException e) {
// we do not have a authnRequest
// check if a valid attr request is container
@@ -127,8 +112,8 @@ public class STORKProtocol implements IModulInfo, MOAIDAuthConstants {
} catch (STORKSAMLEngineException ex) {
Logger.error("Unable to validate Stork AuthenticationRequest: " + ex.getMessage());
}
->>>>>>> origin/bs_3_fr
}
+
// if there is no authn or attr request, raise error
if ((authnRequest == null) && (attrRequest == null)) {
Logger.error("There is no authentication or attribute request contained.");
diff --git a/spss/handbook/clients/api/moa-spss-handbook-apiClient.iml b/spss/handbook/clients/api/moa-spss-handbook-apiClient.iml
index 6ed837a51..4e0a0fddf 100644
--- a/spss/handbook/clients/api/moa-spss-handbook-apiClient.iml
+++ b/spss/handbook/clients/api/moa-spss-handbook-apiClient.iml
@@ -9,6 +9,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="moa-common" />
<orderEntry type="library" name="Maven: axis:axis:1.0_IAIK" level="project" />
<orderEntry type="library" name="Maven: org.apache.axis:axis-jaxrpc:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.axis:axis-saaj:1.4" level="project" />
diff --git a/spss/handbook/clients/webservice/moa-spss-handbook-webserviceClient.iml b/spss/handbook/clients/webservice/moa-spss-handbook-webserviceClient.iml
index 6ed837a51..4e0a0fddf 100644
--- a/spss/handbook/clients/webservice/moa-spss-handbook-webserviceClient.iml
+++ b/spss/handbook/clients/webservice/moa-spss-handbook-webserviceClient.iml
@@ -9,6 +9,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="moa-common" />
<orderEntry type="library" name="Maven: axis:axis:1.0_IAIK" level="project" />
<orderEntry type="library" name="Maven: org.apache.axis:axis-jaxrpc:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.axis:axis-saaj:1.4" level="project" />
diff --git a/spss/server/serverlib/moa-spss-lib.iml b/spss/server/serverlib/moa-spss-lib.iml
index 4c0128bf3..93d7e676f 100644
--- a/spss/server/serverlib/moa-spss-lib.iml
+++ b/spss/server/serverlib/moa-spss-lib.iml
@@ -55,6 +55,8 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="moa-common" />
+ <orderEntry type="module" module-name="moa-common" scope="TEST" production-on-test="" />
<orderEntry type="library" name="Maven: axis:axis:1.0_IAIK" level="project" />
<orderEntry type="library" name="Maven: org.apache.axis:axis-jaxrpc:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.axis:axis-saaj:1.4" level="project" />