Changeset 5014

Timestamp:

04/17/14 17:52:56 (10 years ago)

Author:

olhsha@mpi.nl

Message:

creating user records via froms, shibb and non-shibb

Location:

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend

Files:

• pom.xml (modified) (1 diff)
• src/main/java/eu/dasish/annotation/backend/rest/PrincipalResource.java (modified) (5 diffs)
• src/main/webapp/createprincipal.jsp (deleted)
• src/main/webapp/error.jsp (modified) (1 diff)
• src/main/webapp/index.jsp (modified) (2 diffs)
• src/main/webapp/loginform.jsp (modified) (1 diff)
• src/main/webapp/logout.jsp (modified) (1 diff)
• src/main/webapp/registerNonShibbolethPrincipal.html (added)
• src/main/webapp/registerShibbolethAlsoAsNonShibboleth.html (added)
• src/main/webapp/registerShibbolethPrincipal.html (added)

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

@@ -26 +26 @@
             <version>2.5</version>
             <scope>provided</scope>
-        </dependency>        
+        </dependency>
+<!--        <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-server-linking</artifactId>
+            <version>1.9.1</version>
+        </dependency>       -->
         <dependency>
             <groupId>com.sun.jersey</groupId>

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

@@ -32 +32 @@
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
+import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -54 +55 @@
 public class PrincipalResource extends ResourceResource {
 
+    int shaStrength = 512;
+
     public void setHttpRequest(HttpServletRequest request) {
         this.httpServletRequest = request;
@@ -96 +99 @@
     @GET
     @Produces(MediaType.TEXT_XML)
-    @Path("/info")
+    @Path("info")
     @Transactional(readOnly = true)
     public JAXBElement<Principal> getPrincipalByInfo(@QueryParam("email") String email) throws IOException {
@@ -141 +144 @@
     @Path("create/{remoteId}/{password}")
     public String createSpringAuthenticationRecord(@PathParam("remoteId") String remoteId, @PathParam("password") String password) throws IOException {
-        int result = dbIntegrityService.addSpringUser(remoteId, password, 512, remoteId);
-        return result+ " record(s) has been added. Must be 2: 1 record for the principal, another for the authorities table.";
+        Number remotePrincipalID = this.getPrincipalID();
+        if (remotePrincipalID == null) {
+            return "Logged in principal is null or anonymous.";
+        }
+
+        if (dbIntegrityService.getTypeOfPrincipalAccount(remotePrincipalID).equals(admin)) {
+            int result = dbIntegrityService.addSpringUser(remoteId, password, shaStrength, remoteId);
+            return result + " record(s) has been added. Must be 2: 1 record for the principal, another for the authorities table.";
+        } else {
+            verboseOutput.ADMIN_RIGHTS_EXPECTED();
+            httpServletResponse.sendError(HttpServletResponse.SC_FORBIDDEN);
+            return "Nothing is added.";
+        }
+
     }
 
@@ -175 +190 @@
             return new ObjectFactory().createPrincipal(new Principal());
         }
+
+    }
+
+    @POST
+    @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+    @Produces(MediaType.APPLICATION_XML)
+    @Path("register/nonshibboleth")
+    public JAXBElement<Principal> registerNonShibbolizedPrincipal(@FormParam("name") String name,
+            @FormParam("remoteId") String remoteId, @FormParam("password") String passowrd, @FormParam("email") String email)
+            throws IOException {
+        dbIntegrityService.setServiceURI(uriInfo.getBaseUri().toString());
+        Principal newPrincipal = new Principal();
+        newPrincipal.setDisplayName(name);
+        newPrincipal.setEMail(email);
+        try {
+            try {
+                final int updatedSpringTables = dbIntegrityService.addSpringUser(remoteId, passowrd, shaStrength, remoteId);
+                final Number principalID = dbIntegrityService.addPrincipal(newPrincipal, remoteId);
+                final Principal addedPrincipal = dbIntegrityService.getPrincipal(principalID);
+                return new ObjectFactory().createPrincipal(addedPrincipal);
+            } catch (NotInDataBaseException e1) {
+                loggerServer.debug(e1.toString());
+                httpServletResponse.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e1.toString());
+                return new ObjectFactory().createPrincipal(new Principal());
+            }
+        } catch (PrincipalExists e) {
+            loggerServer.debug(e.toString());
+            httpServletResponse.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.toString());
+            return new ObjectFactory().createPrincipal(new Principal());
+        }
+
+    }
+
+    @POST
+    @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+    @Produces(MediaType.APPLICATION_XML)
+    @Path("register/shibboleth")
+    public JAXBElement<Principal> registerShibbolizedPrincipal(@FormParam("name") String name,
+            @FormParam("remoteId") String remoteId, @FormParam("email") String email)
+            throws IOException {
+        dbIntegrityService.setServiceURI(uriInfo.getBaseUri().toString());
+        Principal newPrincipal = new Principal();
+        newPrincipal.setDisplayName(name);
+        newPrincipal.setEMail(email);
+        try {
+            try {
+                final Number principalID = dbIntegrityService.addPrincipal(newPrincipal, remoteId);
+                final Principal addedPrincipal = dbIntegrityService.getPrincipal(principalID);
+                return new ObjectFactory().createPrincipal(addedPrincipal);
+            } catch (NotInDataBaseException e1) {
+                loggerServer.debug(e1.toString());
+                httpServletResponse.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e1.toString());
+                return new ObjectFactory().createPrincipal(new Principal());
+            }
+        } catch (PrincipalExists e) {
+            loggerServer.debug(e.toString());
+            httpServletResponse.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.toString());
+            return new ObjectFactory().createPrincipal(new Principal());
+        }
+    }
+
+    @POST
+    @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+    @Produces(MediaType.TEXT_PLAIN)
+    @Path("register/shibbolethasnonshibboleth")
+    public String registerShibbolizedPrincipalAsNonShibb(@FormParam("remoteId") String remoteId, @FormParam("password") String password)
+            throws IOException {
+        int result = dbIntegrityService.addSpringUser(remoteId, password, shaStrength, remoteId);
+        return result + " record(s) has been added. Must be 2: 1 record for the principal, another for the authorities table.";
 
     }

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/error.jsp

@@ -25 +25 @@
     <body>
      Authentication error. Check username and password. <br>
-     <a href="index.jsp"> To DWAN's test jsp page.</a><br>
-     <a href="loginform.jsp"> To DWAN's login jsp page.</a>
+     <a href="api/.."> To DWAN's test jsp page.</a><br>
+     <a href="api/authentication/login"> To DWAN's login.</a>
     </body>
 </html>

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/index.jsp

@@ -24 +24 @@
         <p><a href="https://trac.clarin.eu/wiki/DASISH/SpecificationDocument#RESTAPI">https://trac.clarin.eu/wiki/DASISH/SpecificationDocument#RESTAPI</a></p>
       
-<!--        <br> 
-        <a href="createprincipal.jsp"> create principal record</a> <br> 
-        <br> -->
+        <br> 
+        <a href="registerNonShibbolethPrincipal.html"> Register a non-shibboleth user</a> <br> 
+        <br> 
+        <a href="registerShibbolethPrincipal.html"> Register a shibboleth user</a> <br> 
+        <br>
+        <a href="registerShibbolethAlsoAsNonShibboleth.html"> Register an existing  shibboleth user as a non-shibboleth as well.</a> <br> 
+        <br>
+        <br>
         <a href="api/authentication/login"> login  </a> <br> 
          <br> 
@@ -33 +38 @@
         
         <b>Test URI-s</b><br>
+        <br> 
         <b>All output xml-s are valid w.r.t. the schema</b><br>
         GET <a href="api/authentication/principal">api/authentication/principal</a> <br> 

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/loginform.jsp

@@ -33 +33 @@
                     <table>
                         <tr>
-                            <td>User:</td>
+                            <td>Login:</td>
                             <td><input type='text' name='username' value=''></td>
                         </tr>

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/logout.jsp

@@ -25 +25 @@
     <body>
      You are logged out.<br>
-     <a href="index.jsp"> To DWAN's test jsp page.</a>
+     <a href="api/.."> To DWAN's main test page.</a>
     </body>
 </html>