working version of dashboard

Author: alegrm

deb-package/debian/changelog

@@ -1,5 +1,8 @@
 geoknow-generator-ui (1.0.2) ldstack-nightly; urgency=low
 
-  * Initial Release.
+  * Intermediate release of GeoKnow Generatro Workbench
+  * Includes user authentication and users and role management
+  * Implements graph level access control
+  * Requires spring batch admin generator for running batch processes
 
- -- Vadim Zaslawski <vadim.zaslawski@ontos.com>  Wed, 21 Aug 2013 15:01:15 +0200
+ -- Alejandra Garcia Rojas <alejandra.garciarojas@ontos.com>  Tue, 25 Nov 2014 17:11:12 +0200

src/main/java/authentication/web/GraphManagerServlet.java

@@ -150,6 +150,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp)
                     // and
                     // write
                     // graph
+                    log.info(permissions);
                     setGraphPermissions(graph, permissions);
                 }
 
@@ -368,6 +369,7 @@ private void setGraphPermissions(String graph, String permissionsString) throws
         if (permissionsString == null || permissionsString.isEmpty())
             return;
         // set public graph permissions
+        log.info(permissionsString);
         GraphPermissions graphPermissions = parsePermissions(permissionsString);
         virtuosoUserManager.setDefaultGraphPermissions(graph, graphPermissions
                 .getDefaultPermissions());

src/main/java/rest/AuthorizedSessions.java

@@ -26,6 +26,8 @@
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Cookie;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.StreamingOutput;
 import javax.ws.rs.core.UriInfo;
@@ -139,15 +141,15 @@ public Response create(@CookieParam(value = "user") Cookie userc,
     @Path("{sessionToken}")
     public Response get(@PathParam("sessionToken") String sessionToken, @Context UriInfo uriInfo)
             throws Exception {
-        return post(sessionToken, uriInfo);
+        MultivaluedMap<String, String> formParams = new MultivaluedHashMap<String, String>();
+        return post(sessionToken, uriInfo, formParams);
     }
 
     @POST
     @Path("{sessionToken}")
-    public Response post(@PathParam("sessionToken") String sessionToken, @Context UriInfo uriInfo)
-            throws Exception {
+    public Response post(@PathParam("sessionToken") String sessionToken, @Context UriInfo uriInfo,
+            MultivaluedMap<String, String> formParams) throws Exception {
 
-        log.info(sessionToken);
         String username = "";
         /*
          * retrieves form user that created that session and the rdfUser and
@@ -156,10 +158,9 @@ public Response post(@PathParam("sessionToken") String sessionToken, @Context Ur
         try {
             String query = "SELECT ?user FROM <" + sessionsGraph + "> WHERE { ?user " + " <"
                     + LDIWO.sessionToken + "> \"" + sessionToken + "\"^^xsd:string .}";
-            log.debug(query);
 
             String result = frameworkRdfStoreManager.execute(query, "json");
-            log.debug(result);
+
             ObjectMapper mapper = new ObjectMapper();
             JsonNode rootNode = mapper.readTree(result);
             Iterator<JsonNode> bindingsIter = rootNode.path("results").path("bindings")
@@ -192,10 +193,13 @@ public Response post(@PathParam("sessionToken") String sessionToken, @Context Ur
         // create post method and set parameters
         HttpPost proxyMethod = new HttpPost(endpoint);
         ArrayList<NameValuePair> postParameters = new ArrayList<NameValuePair>();
-        for (Entry<String, List<String>> entity : uriInfo.getQueryParameters().entrySet()) {
+        // when is GET we extract query params using uriInfo
+        for (Entry<String, List<String>> entity : uriInfo.getQueryParameters().entrySet())
             postParameters.add(new BasicNameValuePair(entity.getKey(), entity.getValue().get(0)));
+        // when is POST we extract using formParams
+        for (String key : formParams.keySet())
+            postParameters.add(new BasicNameValuePair(key, formParams.getFirst(key)));
 
-        }
         proxyMethod.setEntity(new UrlEncodedFormEntity(postParameters));
         // create the httpclient and reads/wirtes repsponse
         CloseableHttpClient httpClient = HttpClients.createDefault();
@@ -240,7 +244,7 @@ public Response delete(@PathParam("sessionToken") String sessionToken,
                     .build();
         }
 
-        String query = "DELETE FROM <http://generator.geoknow.eu/resource/sessionsGraph> {?s ?p ?o} "
+        String query = "DELETE FROM <" + sessionsGraph + "> {?s ?p ?o} "
                 + "WHERE { ?s ?p ?o . FILTER(str(?o) = \"" + sessionToken + "\") } ";
         log.debug(query);
 
@@ -251,6 +255,6 @@ public Response delete(@PathParam("sessionToken") String sessionToken,
                     .build();
         }
 
-        return Response.ok().build();
+        return Response.status(Response.Status.NO_CONTENT).build();
     }
 }

src/main/java/workflow/BeanFactory.java

@@ -47,7 +47,7 @@ public static Bean createServiceTaskletBean(ObjectFactory factory, String id, St
 
         Bean bean = factory.createBean();
         bean.setId(id);
-        bean.setClazz("org.geoknow.batch.ServiceTasklet");
+        bean.setClazz("eu.geoknow.batch.ServiceTasklet");
         QName.valueOf("property");
 
         PropertyType pservice = factory.createPropertyType();

src/main/java/workflow/rest/Jobs.java

@@ -11,6 +11,7 @@
 import javax.servlet.ServletException;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.CookieParam;
+import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
@@ -88,6 +89,71 @@ public Jobs(@Context ServletContext context) throws ServletException {
         }
     }
 
+    @DELETE
+    @Path("/{jobName}")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response deleteJob(@CookieParam(value = "user") Cookie userc,
+            @CookieParam(value = "token") String token, @PathParam("jobName") String jobName) {
+        UserProfile user;
+        try {
+            user = frameworkUserManager.validate(userc, token);
+            if (user == null)
+                return Response.status(Response.Status.UNAUTHORIZED).entity("Invalid credentials")
+                        .build();
+        } catch (Exception e) {
+            log.error(e);
+            e.printStackTrace();
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.getMessage())
+                    .build();
+        }
+        try {
+            // ask if ther resource exists
+            String query = "ASK { GRAPH <" + jobsGraph + "> {<" + uriBase + jobName + "> <"
+                    + DC.creator.getURI() + "> <" + user.getAccountURI() + "> }}";
+            log.debug(query);
+            String result = frameworkRdfStoreManager.execute(query, "json");
+            ObjectMapper mapper = new ObjectMapper();
+            JsonNode rootNode = mapper.readTree(result);
+            if (rootNode.path("boolean").getBooleanValue()) {
+
+                // stop the execution if running
+                JobExecutions executions = BatchAdminClient.getAllExecutions();
+                JobExecution lastExec = executions.getJobExecutions().get(0);
+                if (lastExec.getStatus().contains("START")) {
+                    log.info("stopping " + lastExec.getId());
+                    BatchAdminClient.stopExecution(lastExec.getId());
+                }
+
+                query = "DELETE FROM <" + jobsGraph + "> { <" + uriBase + jobName + "> ?p ?o} "
+                        + " WHERE { <" + uriBase + jobName + "> ?p ?o ;  <" + DC.creator.getURI()
+                        + "> <" + user.getAccountURI() + "> } ";
+                log.debug(query);
+
+                result = frameworkRdfStoreManager.execute(query, "json");
+                log.debug(result);
+                mapper = new ObjectMapper();
+                rootNode = mapper.readTree(result);
+                Iterator<JsonNode> bindingsIter = rootNode.path("results").path("bindings")
+                        .getElements();
+                if (bindingsIter.hasNext()) {
+                    JsonNode bindingNode = bindingsIter.next();
+                    if (bindingNode.get("callret-0").path("value").getTextValue().contains("done"))
+                        return Response.status(Response.Status.NO_CONTENT).build();
+                }
+                return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
+                        "For some reason, the record was not deleted").build();
+
+            } else
+                return Response.status(Response.Status.NOT_FOUND).build();
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.getMessage())
+                    .build();
+        }
+
+    }
+
     /**
      * Executes job method: Authenticates the user and call the BatchAdminClient
      * to run the job of jobName

src/main/resources/framework-components.ttl

@@ -118,11 +118,11 @@
       a       lds:StackComponent ;
       rdfs:label "Dashboard"^^xsd:string ;
       lds:providesService :SpringBatchAdminService ;
-      lds:version "0.1.0"^^xsd:string ;
+      lds:version "0.0.1"^^xsd:string ;
       foaf:homepage <https://github.com/GeoKnow/spring-batch-admin> .
 :SpringBatchAdminService
 a     lds:BatchProcessingService ;
-      lds:serviceUrl <http://localhost:9999/spring-batch-admin-sample/> .
+      lds:serviceUrl <http://localhost:9999/spring-batch-admin-geoknow/> .
 
 :UserManager
       a       lds:StackComponent ;

src/main/resources/log4j.properties

@@ -8,6 +8,6 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
 
 #log4j.logger.rdf=DEBUG
-log4j.logger.rest=DEBUG
+#log4j.logger.rest=DEBUG
 log4j.logger.workflow=DEBUG
 #log4j.logger.authentication.web=DEBUG

src/main/webapp/js/account/account.html

@@ -26,10 +26,14 @@ <h2>User Account</h2>
         <td>E-mail address:</td>
         <td>{{account.getEmail()}}</td>
       </tr>
-        <tr>
-            <td>Role:</td>
-            <td>{{account.getRole().name}}</td>
-        </tr>
+      <tr>
+        <td>Role:</td>
+        <td>{{account.getRole().name}}</td>
+      </tr>
+      <tr>
+        <td>Settings Graph:</td>
+        <td>{{account.getSettingsGraph()}}</td>
+      </tr>
     </table>
 
     <button type="button" class="btn-sm btn-success" data-toggle="modal" data-target="#modalChangePassword" ng-click="clearChangePasswordForm()">Change password</button>
@@ -39,7 +43,7 @@ <h2>User Account</h2>
       <div class="modal-content">
         <form name="changePasswordForm" class="form-horizontal InputForm" role="form">
           <div class="modal-header">
-            <button type="button" class="close" ng-click="close('#modalLogin')" aria-hidden="true">&times;</button>
+            <button type="button" class="close" ng-click="close('#modalChangePassword')" aria-hidden="true">&times;</button>
             <h5 class="modal-title green bold">Change password</h5>
           </div>
           <div class="modal-body">
@@ -82,7 +86,7 @@ <h5 class="modal-title green bold">Change password</h5>
           </div>
           <div class="modal-footer">
             <button type="submit" class="btn-sm btn-success" ng-click="changePassword();" ng-disabled="changePasswordForm.$invalid">Change</button>
-            <button type="button" class="btn-sm btn-default" ng-click="close('#modalLogin')">Cancel</button>
+            <button type="button" class="btn-sm btn-default" ng-click="close('#modalChangePassword')">Cancel</button>
           </div>
         </form>
       </div>

src/main/webapp/js/admin/users/users.html

@@ -6,7 +6,7 @@ <h3 class="green bold">Users Management</h3>
     <div class="modal fade" id="modalUser">
         <form name="userForm" class="form-horizontal InputForm" role="form">
             <div class="modal-header">
-                <button type="button" class="close" ng-click="close('#modalLogin')" aria-hidden="true">&times;</button>
+                <button type="button" class="close" ng-click="close('#modalUser')" aria-hidden="true">&times;</button>
                 <h5 class="modal-title green bold">{{modaltitle}}</h5>
             </div>
             <div class="modal-body">
@@ -55,7 +55,7 @@ <h5 class="modal-title green bold">{{modaltitle}}</h5>
             </div>
             <div class="modal-footer">
                 <button type="submit" class="btn-sm btn-success" ng-click="save();" ng-disabled="userForm.$invalid">Save</button>
-                <button type="button" class="btn-sm btn-default" ng-click="close('#modalLogin')">Cancel</button>
+                <button type="button" class="btn-sm btn-default" ng-click="close('#modalUser')">Cancel</button>
             </div>
         </form>
     </div>

src/main/webapp/js/app.js

@@ -124,8 +124,7 @@ app.config(function($routeSegmentProvider, $routeProvider)
             .up()
 
 		.segment('settings',{
-			templateUrl: 'js/settings/settings.html'
-		})
+			templateUrl: 'js/settings/settings.html'})
             .within()
                 .segment('datasets', {
                     templateUrl: 'js/settings/datasets/graphs.html'})
@@ -166,13 +165,7 @@ app.config(function($routeSegmentProvider, $routeProvider)
                 })
             .up()
         .segment('system-setup', {
-            templateUrl: 'system-setup.html',
-            // resolve: {
-            //     settings: function (ConfigurationService) {
-            //         return ConfigurationService.getSettings();
-            //     }
-            // }
-        })
+            templateUrl: 'system-setup.html'})
         .segment('default', {
             templateUrl: 'default.html',
             // resolve: {
@@ -214,7 +207,7 @@ app.config(function($routeSegmentProvider, $routeProvider)
     //redirect to system-setup page if system is not set up
     //redirect to access-denied page if user has no access to page
     $rootScope.$on("$routeChangeStart", function(event, next, current) {
-        var account = angular.copy(AccountService.getAccount());
+        var account = AccountService.getAccount();
         if ($rootScope.isSystemSetUp==undefined) {
             $http.get("rest/setup").then(function(response) {
                 $rootScope.isSystemSetUp = response.data == "true";