Changeset 4969


Ignore:
Timestamp:
04/14/14 13:21:44 (10 years ago)
Author:
olhsha@mpi.nl
Message:

fixing new-principal record generation

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

Legend:

Unmodified
Added
Removed

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

    r4956 r4969  
    327327        <netbeans.hint.license>gpl20</netbeans.hint.license> 
    328328        <plugin.license.copyrightYear>2013</plugin.license.copyrightYear>
    329         <project.version>1.3.4</project.version>
     329        <project.version>1.3.5</project.version>
    330330        <shibboleth.version>1.0.4</shibboleth.version>
    331331    </properties>

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

    r4865 r4969  
    6565        return result;
    6666    }
     67   
     68    public static String welcomeString(String baseUri) {
     69        String welcome = "<!DOCTYPE html><body>"
     70                + "You are logged in.<br>"
     71                + "<h3>Welcome to DASISH Webannotator (DWAN)</h3><br>"
     72                + "<a href=\"" + baseUri + "\"> to DWAN's test jsp page</a>"
     73                + "</body>";
     74        return welcome;
     75    }
    6776}

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

    r4914 r4969  
    4747import javax.ws.rs.ext.Providers;
    4848import javax.xml.bind.JAXBElement;
    49 import javax.xml.ws.http.HTTPException;
    5049import org.springframework.stereotype.Component;
    5150import org.springframework.transaction.annotation.Transactional;

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

    r4956 r4969  
    1818package eu.dasish.annotation.backend.rest;
    1919
    20 import eu.dasish.annotation.backend.NotInDataBaseException;
    21 import eu.dasish.annotation.backend.PrincipalExists;
     20import eu.dasish.annotation.backend.Helpers;
    2221import eu.dasish.annotation.schema.ObjectFactory;
    2322import eu.dasish.annotation.schema.Principal;
    2423import java.io.IOException;
    2524import java.sql.SQLException;
    26 import javax.servlet.http.HttpServletResponse;
    2725import javax.ws.rs.GET;
    2826import javax.ws.rs.Path;
    … …  
    6462    @Transactional(readOnly = true)
    6563    public String login() {
    66         return this.welcomeString();
     64        return Helpers.welcomeString(uriInfo.getBaseUri().toString() + "..");
    6765    }
    6866
    … …  
    7775    }
    7876
    79     private String welcomeString() {
    80         String baseUri = uriInfo.getBaseUri().toString() + "..";
    81         String welcome = "<!DOCTYPE html><body>"
    82                 + "<h3>Welcome to DASISH Webannotator (DWAN)</h3><br>"
    83                 + "<a href=\"" + baseUri + "\"> to DWAN's test jsp page</a>"
    84                 + "</body>";
    85         return welcome;
    86     }
     77   
    8778}

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

    r4914 r4969  
    3535import javax.ws.rs.core.MediaType;
    3636import javax.xml.bind.JAXBElement;
    37 import javax.xml.ws.http.HTTPException;
    3837import org.springframework.stereotype.Component;
    3938import org.springframework.transaction.annotation.Transactional;

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

    r4914 r4969  
    4242import javax.xml.bind.JAXBElement;
    4343import javax.xml.parsers.ParserConfigurationException;
    44 import javax.xml.ws.http.HTTPException;
    4544import org.springframework.stereotype.Component;
    4645import org.springframework.transaction.annotation.Transactional;
    … …  
    180179            return new ObjectFactory().createPrincipal(new Principal());
    181180        }
    182         if (dbIntegrityService.getTypeOfPrincipalAccount(remotePrincipalID).equals(admin)) {
    183             try {
    184                 final Number principalID = dbIntegrityService.updatePrincipal(principal);
    185                 final Principal addedPrincipal = dbIntegrityService.getPrincipal(principalID);
    186                 return new ObjectFactory().createPrincipal(addedPrincipal);
    187             } catch (NotInDataBaseException e) {
    188                 loggerServer.debug(e.toString());;
    189                 httpServletResponse.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.toString());
     181        try {
     182            final Number principalID = dbIntegrityService.getResourceInternalIdentifierFromURI(principal.getURI(), Resource.PRINCIPAL);
     183            if (dbIntegrityService.getTypeOfPrincipalAccount(remotePrincipalID).equals(admin)
     184                    || remotePrincipalID.equals(principalID)) {
     185                try {
     186                    final int updatedRows = dbIntegrityService.updatePrincipal(principal);
     187                    final Principal addedPrincipal = dbIntegrityService.getPrincipal(principalID);
     188                    return new ObjectFactory().createPrincipal(addedPrincipal);
     189                } catch (NotInDataBaseException e) {
     190                    loggerServer.debug(e.toString());
     191                    httpServletResponse.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.toString());
     192                    return new ObjectFactory().createPrincipal(new Principal());
     193                }
     194            } else {
     195                verboseOutput.ADMIN_RIGHTS_EXPECTED();
     196                httpServletResponse.sendError(HttpServletResponse.SC_FORBIDDEN);
    190197                return new ObjectFactory().createPrincipal(new Principal());
    191198            }
    192         } else {
    193             verboseOutput.ADMIN_RIGHTS_EXPECTED();
    194             httpServletResponse.sendError(HttpServletResponse.SC_FORBIDDEN);
     199        } catch (NotInDataBaseException e1) {
     200            loggerServer.debug(e1.toString());
     201            httpServletResponse.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e1.toString());
    195202            return new ObjectFactory().createPrincipal(new Principal());
    196203        }

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

    r4956 r4969  
    8787        }
    8888
    89 
    90 //        dbIntegrityService.setServiceURI(uriInfo.getBaseUri().toString());
    91 //        verboseOutput = new VerboseOutput(loggerServer);
    92 //        String remotePrincipal = httpServletRequest.getRemoteUser();
    93 //        if (remotePrincipal != null) {
    94 //            if (!remotePrincipal.equals(anonym)) {
    95 //                try {
    96 //                    return dbIntegrityService.getPrincipalInternalIDFromRemoteID(remotePrincipal);
    97 //                } catch (NotInDataBaseException e) {
    98 //                    loggerServer.info(e.toString());
    99 //                    httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, e.toString());
    100 //                    return null;
    101 //                }
    102 //            } else {
    103 //                loggerServer.info("Shibboleth fall-back.  Logged in as 'anonymous' with no rights.");
    104 //                httpServletResponse.sendError(HttpServletResponse.SC_UNAUTHORIZED, " Shibboleth fall-back.  Logged in as 'anonymous' with no rights.");
    105 //                return null;
    106 //            }
    107 //        } else {
    108 //            loggerServer.info("Not logged in.");
    109 //            httpServletResponse.sendError(HttpServletResponse.SC_UNAUTHORIZED, " Not logged in.");
    110 //            return null;
    111 //        }
    11289    }
    11390}

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

    r4903 r4969  
    1919
    2020import java.io.IOException;
    21 import javax.servlet.http.HttpServletResponse;
    2221import org.slf4j.Logger;
    2322

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

    r4914 r4969  
    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

    r4956 r4969  
    8282    </servlet-mapping>
    8383   
    84    <security-constraint>
     84<!--   <security-constraint>
    8585        <display-name>Protected backend localhost</display-name>
    8686        <web-resource-collection>
    … …  
    104104        </description>
    105105        <role-name>tomcat</role-name>
    106     </security-role>
     106    </security-role> -->
    107107   
    108 <!--    <filter>
     108    <filter>
    109109        <filter-name>AAIFilter</filter-name>
    110110        <filter-class>de.mpg.aai.shhaa.AuthFilter</filter-class>
    … …  
    113113        <filter-name>AAIFilter</filter-name>
    114114        <url-pattern>/*</url-pattern>
    115     </filter-mapping> -->
     115    </filter-mapping>
    116116   
    117117   
Note: See TracChangeset for help on using the changeset viewer.