Changeset 5275
- Timestamp:
- 05/23/14 14:29:09 (10 years ago)
- Location:
- DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend
- Files:
-
- 3 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/CHANGES.txt
r5203 r5275 30 30 May 15, 2014. Added validation (via the schem on SCHEMAcat) of the xmls sent by client. Refactoring. 31 31 fixing busg with escape symbols and URL encoding of them. 32 33 May 22, 2014. Resored automated prinicpal record generation for a fresh shibbolized user, update 34 principal is fixed (both issues have appeared after eralier refactoring). Jsp pages are updated, 35 dynamical logout adress is generated. -
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/README.txt
r4755 r5275 22 22 === Logging in === 23 23 24 Shibbolized authentication is implemented for lux16 and lux17, and basic tomcat works for localhost.24 Authentication is possible for lux16 and lux17 for 2 settings: vi ashibboleth and as spring basic. 25 25 26 26 -
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/UPDATE.txt
r5203 r5275 1 1. Placing tarball: as always, take the tar-ball of the new version 1.4 , and follow the1 1. Placing tarball: as always, take the tar-ball of the new version 1.4.1, and follow the 2 2 standard MPI deployment procedure. Consult the instructions from INSTALL.txt 3 3 about placing war file if you have forgotten. 4 4 5 2. Adjusting shhaa.xml , database, web.xml this time are not necessary. OR if you want to reuse6 this tarball to deploy shibbolized version you need to change web.xml 5 2. Adjusting shhaa.xml: as always, if it is deloyment on lux17 (or production), set 6 <sso action="lI"> and <slo action="lO"> 7 7 8 2.1. Comment <filter> 8 3. This time the databse stays intact. 9 10 4. web.xml differs for ds/webannotator (shibboleth authentication) 11 and ds/webannotator-basic (basic spring authentication). 12 13 4.1. Filter. For the ds/webannotator use 14 15 <filter> 9 16 <filter-name>AAIFilter</filter-name> 10 17 <filter-class>de.mpg.aai.shhaa.AuthFilter</filter-class> … … 15 22 </filter-mapping> 16 23 17 and uncomment24 and for the ds/webannotator-basic use 18 25 19 26 <filter> … … 27 34 28 35 29 2.2. Comment <param-value>/ds/webannotator/j_spring_security_logout</param-value> and uncomment 30 <param-value>/ds/webannotator?shhaaDo=lO</param-value> 36 4.2. Settting <param-name>eu.dasish.annotation.backend.logout</param-name>. 37 For the ds/webannotator 38 (if shibboleth's logout address is of the form http://lux17.mpi.nl/Shibboleth.sso/Logout) 39 40 <param-value>/../../Shibboleth.sso/Logout</param-value> 41 42 The "../../" is necessary to climb from http://lux17.mpi.nl/ds/webannotator to 43 http://lux17.mpi.nl. 44 45 and for ds/webannotator-basic use 46 47 <param-value>/j_spring_security_logout</param-value> 48 -
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AutheticationResource.java
r5266 r5275 78 78 public void logout() throws IOException, ServletException { 79 79 httpServletRequest.getSession().invalidate(); 80 httpServletResponse.sendRedirect(uriInfo.getBaseUri().toString() + ".."+context.getInitParameter("eu.dasish.annotation.backend.logout")); 80 boolean isShibboleth = Boolean.parseBoolean(context.getInitParameter("eu.dasish.annotation.backend.isShibbolethSession")); 81 String redirect = isShibboleth ? context.getInitParameter("eu.dasish.annotation.backend.logout") : 82 uriInfo.getBaseUri().toString() + ".."+context.getInitParameter("eu.dasish.annotation.backend.logout"); 83 httpServletResponse.sendRedirect(redirect); 81 84 } 82 85 } -
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web.xml
r5266 r5275 45 45 </context-param> 46 46 <context-param> 47 <param-name>eu.dasish.annotation.backend.isShibbolethSession</param-name> 48 <param-value>false</param-value> 49 </context-param> 50 <context-param> 47 51 <param-name>eu.dasish.annotation.backend.logout</param-name> 48 <!-- <param-value>/ds/webannotator?shhaaDo=lO</param-value>-->49 <!-- <param-value>/ds/webannotatornonshibb/j_spring_security_logout</param-value>-->50 <!-- <param-value>/ds/webannotator-basic/j_spring_security_logout</param-value>-->51 52 <param-value>/j_spring_security_logout</param-value> 52 53 </context-param> … … 117 118 <url-pattern>/*</url-pattern> 118 119 </filter-mapping> 120 121 </web-app> 119 122 120 <!-- Shibboleth filter -->121 <!-- <filter>122 <filter-name>AAIFilter</filter-name>123 <filter-class>de.mpg.aai.shhaa.AuthFilter</filter-class>124 </filter>125 <filter-mapping>126 <filter-name>AAIFilter</filter-name>127 <url-pattern>/*</url-pattern>128 </filter-mapping> -->129 130 131 </web-app>
Note: See TracChangeset
for help on using the changeset viewer.