Changeset 5840 for DASISH


Ignore:
Timestamp:
11/20/14 13:47:17 (10 years ago)
Author:
olhsha@mpi.nl
Message:

more tests, error message is beter

Location:
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/CHANGES.txt

    r5836 r5840  
    7272be  ignored.
    7373
     74November 20, 2014.  A new feature: an "all" access mode is added. The user with this permission have
     75the same rights as the owner, that it he can update permissions on the annotation
     76and delete it at all. Also, the pieces of code handling permissions, have been refactored.

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/UPDATE.txt

    r5836 r5840  
    11
    2 Placing tarball: take the tar-ball of the new  version 1.6-basic, and follow the
    3 standard MPI deployment procedure. 
     2Placing tarball: take the tar-ball of the new  version 1.6.1-shibboleth, and follow the
     3standard MPI deployment procedure.
    44
    5 A new feature: a user with "write" access can update
    6 annotation as a whole, but if he also sends permission updates they will be
    7 ignored.
     5Update the dasish annotation database with:
     6INSERT INTO access(access_mode) VALUES ('all');
     7
     8A new feature: an "all" access mode is added. The user with this permission have
     9the same rights as the owner, that it he can update permissions on the annotation
     10and delete it at all.
    811
    912

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/pom.xml

    r5836 r5840  
    55    <groupId>eu.dasish.annotation</groupId>
    66    <artifactId>annotator-backend</artifactId>
    7     <version>1.6-shibboleth</version>   
     7    <version>1.6.1-shibboleth</version>   
    88    <packaging>war</packaging>
    99    <name>annotator-backend Jersey Webapp</name>

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/RequestWrappers.java

    r5836 r5840  
    4949
    5050    public String FORBIDDEN_RESOURCE_ACTION(String identifier, String resource, String action) {
    51         return " The logged-in principal cannot " + action + " the " + resource + " with the identifier " + identifier;
     51        return " The logged-in principal cannot perform action that falls under access mode'" + action + "', with the " + resource + " with the identifier " + identifier;
    5252    }
    5353

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/shhaa.xml

    r5774 r5840  
    3838                <username>anonymous</username>
    3939            </fallback>
    40             <sso action="lI">https://lux17.mpi.nl/Shibboleth.sso/Login</sso>
    41             <slo action="lO">https://lux17.mpi.nl/Shibboleth.sso/Logout</slo>
     40            <sso action="lI">https://lux16.mpi.nl/Shibboleth.sso/Login</sso>
     41            <slo action="lO">https://lux16.mpi.nl/Shibboleth.sso/Logout</slo>
    4242        </authentication>
    4343       

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web.xml

    r5838 r5840  
    4040    <context-param>
    4141        <param-name>eu.dasish.annotation.backend.isShibbolethSession</param-name>
    42         <param-value>false</param-value>
     42        <param-value>true</param-value>
    4343    </context-param>
    4444    <context-param>
    … …  
    4848    <context-param>
    4949        <param-name>eu.dasish.annotation.backend.logout.shibboleth</param-name>
    50         <param-value>https://lux17.mpi.nl/Shibboleth.sso/Logout</param-value>
     50        <param-value>https://lux16.mpi.nl/Shibboleth.sso/Logout</param-value>
    5151    </context-param>
    5252   
    … …  
    111111   
    112112    <!-- Spring security -->
    113       <filter>
     113     <!-- <filter>
    114114        <filter-name>springSecurityFilterChain</filter-name>
    115115        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
    … …  
    118118        <filter-name>springSecurityFilterChain</filter-name>
    119119        <url-pattern>/*</url-pattern>
    120     </filter-mapping>
     120    </filter-mapping> -->
    121121   
    122122    <!--  Shibboleth filter -->
    123   <!-- <filter>
     123  <filter>
    124124        <filter-name>AAIFilter</filter-name>
    125125        <filter-class>de.mpg.aai.shhaa.AuthFilter</filter-class>
    … …  
    128128        <filter-name>AAIFilter</filter-name>
    129129        <url-pattern>/*</url-pattern>
    130     </filter-mapping> -->
     130    </filter-mapping>
    131131   
    132132  </web-app> 
Note: See TracChangeset for help on using the changeset viewer.