From ed19c3b21b338e05efae1067216a5bbb7d60efe4 Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Fri, 17 Jan 2014 16:09:46 +0100 Subject: changing chars to reflect utf8 --- id/server/auth/moa-id-auth.iml | 140 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) create mode 100644 id/server/auth/moa-id-auth.iml (limited to 'id/server/auth') diff --git a/id/server/auth/moa-id-auth.iml b/id/server/auth/moa-id-auth.iml new file mode 100644 index 000000000..b92baa5b7 --- /dev/null +++ b/id/server/auth/moa-id-auth.iml @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 2e59ebb5e82cac6fa4defc0ca4d201e59891d84f Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Fri, 17 Jan 2014 16:57:02 +0100 Subject: adding stork2 support to urlrewrite --- id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'id/server/auth') diff --git a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml index d33cae207..cc9cc8236 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml @@ -52,7 +52,19 @@ /dispatcher?mod=id_pvp2x&action=Soap - + + ^/stork2/StartAuthentication$ + /dispatcher?mod=id_stork2&action=AuthenticationRequest&%{query-string} + + + ^/stork2/SendPEPSAuthnRequest$ + /dispatcher?mod=id_stork2&action=AuthenticationRequest&%{query-string} + + + + + + The outbound-rule specifies that when response.encodeURL is called (if you are using JSTL c:url) -- cgit v1.2.3 From bc203edf3011ab7ef194d24fb0921eb92a8ac6de Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Wed, 22 Jan 2014 11:42:27 +0100 Subject: stork saml engine change log4j scope --- id/server/auth/moa-id-auth.iml | 1 + 1 file changed, 1 insertion(+) (limited to 'id/server/auth') diff --git a/id/server/auth/moa-id-auth.iml b/id/server/auth/moa-id-auth.iml index b92baa5b7..4c9b1f5b7 100644 --- a/id/server/auth/moa-id-auth.iml +++ b/id/server/auth/moa-id-auth.iml @@ -84,6 +84,7 @@ + -- cgit v1.2.3 From 52dabc099bc80230128a621aa14f1010ba12221e Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Wed, 22 Jan 2014 18:26:58 +0100 Subject: peps saml engine adjustment --- id/server/auth/moa-id-auth.iml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'id/server/auth') diff --git a/id/server/auth/moa-id-auth.iml b/id/server/auth/moa-id-auth.iml index 4c9b1f5b7..f581b8feb 100644 --- a/id/server/auth/moa-id-auth.iml +++ b/id/server/auth/moa-id-auth.iml @@ -26,7 +26,6 @@ - @@ -85,6 +84,14 @@ + + + + + + + + @@ -102,7 +109,6 @@ - @@ -132,9 +138,6 @@ - - - -- cgit v1.2.3 From 791615f1f887f81ade19a374e2552f3cb1be89ab Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Mon, 3 Feb 2014 19:04:01 +0100 Subject: merging again --- id/server/auth/moa-id-auth.iml | 148 +++++++++++++++++++++++++++++++++-------- 1 file changed, 119 insertions(+), 29 deletions(-) (limited to 'id/server/auth') diff --git a/id/server/auth/moa-id-auth.iml b/id/server/auth/moa-id-auth.iml index 41a8f4f0a..fe65bde29 100644 --- a/id/server/auth/moa-id-auth.iml +++ b/id/server/auth/moa-id-auth.iml @@ -14,8 +14,8 @@ - - + + @@ -25,42 +25,132 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3 From 65fb688c9323696fcc12e1c049a2b6a75d6ff1e5 Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Tue, 4 Feb 2014 17:25:09 +0100 Subject: merging with other code --- id/server/auth/moa-id-auth.iml | 73 ++++++++++++++++++++++++++---------------- 1 file changed, 46 insertions(+), 27 deletions(-) (limited to 'id/server/auth') diff --git a/id/server/auth/moa-id-auth.iml b/id/server/auth/moa-id-auth.iml index fe65bde29..d0aa970fc 100644 --- a/id/server/auth/moa-id-auth.iml +++ b/id/server/auth/moa-id-auth.iml @@ -25,12 +25,54 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + @@ -59,16 +101,12 @@ - - - - @@ -84,12 +122,6 @@ - - - - - - @@ -129,28 +161,15 @@ - - - - - - - - - - - - - -- cgit v1.2.3 From 4c104d5d8349195007d19a13ed54426f9fe7b49a Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Thu, 6 Feb 2014 18:29:23 +0100 Subject: iml --- id/server/auth/moa-id-auth.iml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'id/server/auth') diff --git a/id/server/auth/moa-id-auth.iml b/id/server/auth/moa-id-auth.iml index d0aa970fc..f61dfa171 100644 --- a/id/server/auth/moa-id-auth.iml +++ b/id/server/auth/moa-id-auth.iml @@ -14,8 +14,8 @@ - - + + -- cgit v1.2.3 From 6e4f150c26b55cb2a0771e4d6c9b65cbc760c0f2 Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Fri, 14 Feb 2014 16:11:09 +0100 Subject: logging --- id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'id/server/auth') diff --git a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml index f8fdcaffc..b63d413d0 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml @@ -60,9 +60,13 @@ ^/stork2/SendPEPSAuthnRequest$ /dispatcher?mod=id_stork2&action=AuthenticationRequest&%{query-string} + + ^/moa-id-auth/SendPEPSAuthnRequest$ + /dispatcher?mod=id_stork2&action=AuthenticationRequest&%{query-string} + - + ^/oauth2/auth\\?(.*)$ /dispatcher?mod=id_oauth20&action=AUTH&%{query-string} -- cgit v1.2.3 From 3f388c8862a4543d8c7f791e5ff47090d533aa0c Mon Sep 17 00:00:00 2001 From: Florian Reimair Date: Thu, 20 Feb 2014 14:55:17 +0100 Subject: added attribute collector action to protocol and urlrewrite --- id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'id/server/auth') diff --git a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml index f8fdcaffc..563ee04dd 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml @@ -56,6 +56,10 @@ ^/stork2/StartAuthentication$ /dispatcher?mod=id_stork2&action=AuthenticationRequest&%{query-string} + + ^/stork2/ResumeAuthentication$ + /dispatcher?mod=id_stork2&action=AttributeCollector&%{query-string} + ^/stork2/SendPEPSAuthnRequest$ /dispatcher?mod=id_stork2&action=AuthenticationRequest&%{query-string} -- cgit v1.2.3 From 8dbc7af299d5e7a1dd4d1085d2840ff00f403bbb Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Mon, 3 Mar 2014 20:28:57 +0100 Subject: attribut test --- id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'id/server/auth') diff --git a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml index 59d6d6cce..d6df363c5 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml @@ -68,6 +68,10 @@ ^/moa-id-auth/SendPEPSAuthnRequest$ /dispatcher?mod=id_stork2&action=AuthenticationRequest&%{query-string} + + ^/moa-id-auth/RetrieveMandate$ + /dispatcher?mod=id_stork2&action=MandateRetrievalRequest&%{query-string} + -- cgit v1.2.3 From cd0887a43b0b4350e736433c2b513901a2151601 Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Tue, 4 Mar 2014 17:51:06 +0100 Subject: after merge, having problem --- id/server/auth/moa-id-auth.iml | 19 +++++-------------- id/server/auth/pom.xml | 9 +++++++-- 2 files changed, 12 insertions(+), 16 deletions(-) (limited to 'id/server/auth') diff --git a/id/server/auth/moa-id-auth.iml b/id/server/auth/moa-id-auth.iml index f61dfa171..b8b4208b8 100644 --- a/id/server/auth/moa-id-auth.iml +++ b/id/server/auth/moa-id-auth.iml @@ -14,8 +14,8 @@ - - + + @@ -96,19 +96,10 @@ - + - - - - - - - - - - + @@ -134,12 +125,12 @@ - + diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml index 987ae1951..c17722df0 100644 --- a/id/server/auth/pom.xml +++ b/id/server/auth/pom.xml @@ -79,8 +79,13 @@ MOA.id.server moa-id-lib - - + + eu.stork + oasis-dss-api + 1.0.0-SNAPSHOT + + + iaik.prod iaik_jce_full -- cgit v1.2.3 From 7f1c5affaa9358bef6995371dc08c8f0c981a849 Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Tue, 4 Mar 2014 20:06:41 +0100 Subject: resolving problems related to commons and slf4j libraries --- id/server/auth/moa-id-auth.iml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'id/server/auth') diff --git a/id/server/auth/moa-id-auth.iml b/id/server/auth/moa-id-auth.iml index b8b4208b8..043374bc0 100644 --- a/id/server/auth/moa-id-auth.iml +++ b/id/server/auth/moa-id-auth.iml @@ -53,6 +53,11 @@ + + + + + @@ -91,11 +96,6 @@ - - - - - -- cgit v1.2.3 From 19e164874ea92d51f9df12f56047d77db9683091 Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Wed, 5 Mar 2014 20:57:05 +0100 Subject: storkid derivation pro country --- id/server/auth/moa-id-auth.iml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'id/server/auth') diff --git a/id/server/auth/moa-id-auth.iml b/id/server/auth/moa-id-auth.iml index 043374bc0..bf76e8805 100644 --- a/id/server/auth/moa-id-auth.iml +++ b/id/server/auth/moa-id-auth.iml @@ -58,6 +58,7 @@ + @@ -96,7 +97,6 @@ - -- cgit v1.2.3 From ed54650118390e2747dece3bad6bd74b6eefec7a Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Wed, 5 Mar 2014 21:28:25 +0100 Subject: merge ar-bs --- id/server/auth/moa-id-auth.iml | 1 + 1 file changed, 1 insertion(+) (limited to 'id/server/auth') diff --git a/id/server/auth/moa-id-auth.iml b/id/server/auth/moa-id-auth.iml index bf76e8805..815c21ef2 100644 --- a/id/server/auth/moa-id-auth.iml +++ b/id/server/auth/moa-id-auth.iml @@ -23,6 +23,7 @@ + -- cgit v1.2.3 From f144311799a2d491bc6c7de88f43665cc8ad2254 Mon Sep 17 00:00:00 2001 From: Andreas Reiter Date: Thu, 6 Mar 2014 11:02:58 +0100 Subject: Updated oasis-dss-api version to 1.0.0-RELEASE --- id/server/auth/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'id/server/auth') diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml index c17722df0..e1fd9d55a 100644 --- a/id/server/auth/pom.xml +++ b/id/server/auth/pom.xml @@ -82,7 +82,7 @@ eu.stork oasis-dss-api - 1.0.0-SNAPSHOT + 1.0.0-RELEASE -- cgit v1.2.3 From 3075521544ff79c5fa0d740c6b388bfeab58b8c5 Mon Sep 17 00:00:00 2001 From: Florian Reimair Date: Wed, 12 Mar 2014 09:57:37 +0100 Subject: storing datacontainer in temporary storage before redirecting --- id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'id/server/auth') diff --git a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml index d6df363c5..461ff7efc 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml @@ -60,6 +60,10 @@ ^/stork2/ResumeAuthentication$ /dispatcher?mod=id_stork2&action=AttributeCollector&%{query-string} + + ^/stork2/CompleteAuthentication$ + /dispatcher?mod=id_stork2&action=ConsentEvaluator&%{query-string} + ^/stork2/SendPEPSAuthnRequest$ /dispatcher?mod=id_stork2&action=AuthenticationRequest&%{query-string} -- cgit v1.2.3 From 60ac2a89fce86eb1e8344eb22535cfdd0b9aa147 Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Fri, 14 Mar 2014 18:37:56 +0100 Subject: attr --- id/server/auth/moa-id-auth.iml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'id/server/auth') diff --git a/id/server/auth/moa-id-auth.iml b/id/server/auth/moa-id-auth.iml index 815c21ef2..c431a320c 100644 --- a/id/server/auth/moa-id-auth.iml +++ b/id/server/auth/moa-id-auth.iml @@ -23,7 +23,6 @@ - @@ -78,8 +77,8 @@ - - + + @@ -98,7 +97,7 @@ - + @@ -153,7 +152,7 @@ - + -- cgit v1.2.3 From 0b3249e37b26e029c576127654dca31bff4a5a63 Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Mon, 17 Mar 2014 18:23:52 +0100 Subject: removing old samlengine and storkcommons --- id/server/auth/moa-id-auth.iml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'id/server/auth') diff --git a/id/server/auth/moa-id-auth.iml b/id/server/auth/moa-id-auth.iml index c431a320c..73af6885e 100644 --- a/id/server/auth/moa-id-auth.iml +++ b/id/server/auth/moa-id-auth.iml @@ -77,7 +77,7 @@ - + -- cgit v1.2.3 From 7f896d543b412062935db895c9a951d64d638b5d Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Tue, 18 Mar 2014 16:02:05 +0100 Subject: correcting mandate request --- id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'id/server/auth') diff --git a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml index 461ff7efc..5ed7739ec 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml @@ -69,11 +69,11 @@ /dispatcher?mod=id_stork2&action=AuthenticationRequest&%{query-string} - ^/moa-id-auth/SendPEPSAuthnRequest$ + ^/stork2/SendPEPSAuthnRequest$ /dispatcher?mod=id_stork2&action=AuthenticationRequest&%{query-string} - ^/moa-id-auth/RetrieveMandate$ + ^/stork2/RetrieveMandate$ /dispatcher?mod=id_stork2&action=MandateRetrievalRequest&%{query-string} -- cgit v1.2.3 From 70e3ac3a5a76c430f453019eba72a1f291069913 Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Thu, 20 Mar 2014 13:35:29 +0100 Subject: adjust bpk builder --- id/server/auth/moa-id-auth.iml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'id/server/auth') diff --git a/id/server/auth/moa-id-auth.iml b/id/server/auth/moa-id-auth.iml index 73af6885e..a82e8089d 100644 --- a/id/server/auth/moa-id-auth.iml +++ b/id/server/auth/moa-id-auth.iml @@ -14,8 +14,8 @@ - - + + @@ -78,7 +78,7 @@ - + -- cgit v1.2.3 From 2a9896057ee6e42a6a07bcf2ec3eae13c582e290 Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Thu, 20 Mar 2014 15:01:17 +0100 Subject: correcting the error when defining new stork applicaiton --- id/server/auth/moa-id-auth.iml | 44 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'id/server/auth') diff --git a/id/server/auth/moa-id-auth.iml b/id/server/auth/moa-id-auth.iml index a82e8089d..67a88ff74 100644 --- a/id/server/auth/moa-id-auth.iml +++ b/id/server/auth/moa-id-auth.iml @@ -14,8 +14,8 @@ - - + + @@ -77,26 +77,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -114,6 +94,7 @@ + @@ -150,6 +131,25 @@ + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 658cb68c445d5b73815c43b66dd717483a425ea5 Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Fri, 21 Mar 2014 11:23:03 +0100 Subject: service provider url --- id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'id/server/auth') diff --git a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml index 5ed7739ec..6f451ec79 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml @@ -68,6 +68,10 @@ ^/stork2/SendPEPSAuthnRequest$ /dispatcher?mod=id_stork2&action=AuthenticationRequest&%{query-string} + + ^/stork2/ServiceProvider$ + /dispatcher?mod=id_stork2&action=AuthenticationRequest&%{query-string} + ^/stork2/SendPEPSAuthnRequest$ /dispatcher?mod=id_stork2&action=AuthenticationRequest&%{query-string} -- cgit v1.2.3