Merge remote-tracking branch 'origin/master'

robeio · Nov 10, 2015 · 3465431 · 3465431
2 parents 039fecd + 1078d0b
commit 3465431
Show file tree

Hide file tree

Showing 23 changed files with 166 additions and 78 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>io.robe</groupId>
     <artifactId>robe-parent</artifactId>
-    <version>0.4.5.3</version>
+    <version>0.4.5.4</version>
     <packaging>pom</packaging>
     <name>Robe Project</name>
     <url>www.robe.io</url>
@@ -305,7 +305,7 @@
     </dependencies>
 
 
-    <profiles>
+  <profiles>
         <profile>
             <id>release-sign-artifacts</id>
             <activation>
@@ -433,7 +433,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
+             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
                 <version>1.5</version>

diff --git a/robe-admin/pom.xml b/robe-admin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.robe</groupId>
         <artifactId>robe-parent</artifactId>
-        <version>0.4.5.3</version>
+        <version>0.4.5.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/robe-admin/src/main/java/io/robe/admin/hibernate/entity/ActionLog.java b/robe-admin/src/main/java/io/robe/admin/hibernate/entity/ActionLog.java
@@ -25,6 +25,10 @@ public class ActionLog extends BaseEntity {
     @Column
     private boolean positive;
 
+    public ActionLog() {
+
+    }
+
     public ActionLog(String actionType, boolean positive) {
         this.actionType = actionType;
         this.positive = positive;

diff --git a/robe-admin/src/main/java/io/robe/admin/resources/AuthResource.java b/robe-admin/src/main/java/io/robe/admin/resources/AuthResource.java
@@ -76,7 +76,6 @@ public AuthResource(UserDao userDao) {
     @Timed
     public Response login(@Context HttpServletRequest request, Map<String, String> credentials) throws Exception {
 
-
         Optional<User> user = userDao.findByUsername(credentials.get("username"));
         if (!user.isPresent()) {
             throw new WebApplicationException(Response.Status.UNAUTHORIZED);
@@ -105,7 +104,7 @@ public Response login(@Context HttpServletRequest request, Map<String, String> c
             }
             int failCount = user.get().getFailCount() + 1;
             user.get().setFailCount(failCount);
-            boolean block = failCount >= ((Integer) SystemParameterCache.get("USER_BLOCK_FAIL_LIMIT", 3));
+            boolean block = failCount >= Integer.valueOf((String) SystemParameterCache.get("USER_BLOCK_FAIL_LIMIT", "3"));
             if (block)
                 user.get().setActive(false);
 
@@ -126,17 +125,12 @@ private void logAction(ActionLog login) {
     @Path("logout")
     @Timed
     public User logout(@Auth Credentials credentials) throws Exception {
-
-
         Optional<User> user = userDao.findByUsername(credentials.getUsername());
         if (!user.isPresent()) {
             throw new WebApplicationException(Response.Status.UNAUTHORIZED);
         } else {
-
             BasicToken.clearPermissionCache(credentials.getUsername());
-
             user.get().setLastLogoutTime(DateTime.now().toDate());
-
             return user.get();
         }
     }

diff --git a/robe-admin/src/main/java/io/robe/admin/resources/BaseResource.java b/robe-admin/src/main/java/io/robe/admin/resources/BaseResource.java
@@ -0,0 +1,65 @@
+package io.robe.admin.resources;
+
+import com.google.inject.Inject;
+import io.dropwizard.auth.Auth;
+import io.dropwizard.hibernate.UnitOfWork;
+import io.robe.auth.Credentials;
+import io.robe.hibernate.dao.BaseDao;
+import io.robe.hibernate.entity.BaseEntity;
+import org.hibernate.CacheMode;
+import org.hibernate.FlushMode;
+
+import javax.validation.Valid;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import java.lang.reflect.ParameterizedType;
+import java.util.List;
+
+public abstract class BaseResource<T extends BaseEntity> {
+
+    @Inject
+    private BaseDao<T> dao;
+
+    private final Class<T> entity;
+
+    @SuppressWarnings("unchecked")
+    protected BaseResource() {
+        this.entity = (Class<T>) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0];
+    }
+
+    @Path("all")
+    @GET
+    @UnitOfWork
+    public List<T> getAll(@Auth Credentials credentials) {
+        return dao.findAll(entity);
+    }
+
+    @Path("{modelOid}")
+    @GET
+    @UnitOfWork
+    public T get(@PathParam("modelOid") String modelOid, @Auth Credentials credentials) {
+        return dao.findById(entity, modelOid);
+    }
+
+    @PUT
+    @UnitOfWork
+    public T create(@Valid T model, @Auth Credentials credentials) {
+        return dao.create(model);
+    }
+
+    @POST
+    @UnitOfWork
+    public T update(@Valid T model, @Auth Credentials credentials) {
+        return dao.update(model);
+    }
+
+    @DELETE
+    @UnitOfWork
+    public T delete(@Valid T model, @Auth Credentials credentials) {
+        return dao.delete(model);
+    }
+}
diff --git a/robe-admin/src/main/java/io/robe/admin/resources/SystemParameterResource.java b/robe-admin/src/main/java/io/robe/admin/resources/SystemParameterResource.java
@@ -6,6 +6,7 @@
 import io.dropwizard.hibernate.UnitOfWork;
 import io.robe.admin.hibernate.dao.SystemParameterDao;
 import io.robe.admin.hibernate.entity.SystemParameter;
+import io.robe.admin.util.SystemParameterCache;
 import io.robe.auth.Credentials;
 import io.robe.common.exception.RobeRuntimeException;
 import org.hibernate.FlushMode;
@@ -59,4 +60,13 @@ public SystemParameter update(@Auth Credentials credentials, @Valid SystemParame
     public SystemParameter delete(@Auth Credentials credentials, @Valid SystemParameter systemParameter) {
         return systemParameterDao.delete(systemParameter);
     }
+
+    @POST
+    @Path("clearcache")
+    @UnitOfWork(readOnly = true, flushMode = FlushMode.MANUAL)
+    public void clearCache() {
+        SystemParameterCache.fillCache();
+    }
+
+
 }
diff --git a/robe-admin/src/main/java/io/robe/admin/resources/UserResource.java b/robe-admin/src/main/java/io/robe/admin/resources/UserResource.java
@@ -17,6 +17,7 @@
 import io.robe.admin.util.TemplateManager;
 import io.robe.auth.AbstractAuthResource;
 import io.robe.auth.Credentials;
+import io.robe.auth.tokenbased.BasicToken;
 import io.robe.common.exception.RobeRuntimeException;
 import io.robe.mail.MailItem;
 import io.robe.mail.MailManager;
@@ -179,6 +180,8 @@ public UserDTO update(@Auth Credentials credentials, @Valid UserDTO user) {
         entity = userDao.update(entity);
         userDao.flush();
 
+        BasicToken.clearPermissionCache(entity.getUsername());
+
         return new UserDTO(entity);
 
     }

diff --git a/robe-admin/src/main/java/io/robe/admin/util/SystemParameterCache.java b/robe-admin/src/main/java/io/robe/admin/util/SystemParameterCache.java
@@ -23,6 +23,9 @@ public static void fillCache() {
 
 
     public static Object get(String key, Object defaultValue) {
+        if (cache.isEmpty()) {
+            fillCache();
+        }
         Object value = cache.get(key);
         return (value == null) ? defaultValue : value;
     }

diff --git a/robe-assets/pom.xml b/robe-assets/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>robe-parent</artifactId>
         <groupId>io.robe</groupId>
-        <version>0.4.5.3</version>
+        <version>0.4.5.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/robe-auth/pom.xml b/robe-auth/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>robe-parent</artifactId>
         <groupId>io.robe</groupId>
-        <version>0.4.5.3</version>
+        <version>0.4.5.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/robe-auth/src/main/java/io/robe/auth/tokenbased/BasicToken.java b/robe-auth/src/main/java/io/robe/auth/tokenbased/BasicToken.java
@@ -41,30 +41,6 @@ public class BasicToken implements Token {
     private int maxAge;
 
 
-    /**
-     * Configure method for Token generation configurations and ENCRYPTOR configure
-     *
-     * @param configuration
-     */
-    public static void configure(TokenBasedAuthConfiguration configuration) {
-        ENCRYPTOR.setPoolSize(configuration.getPoolSize());          // This would be a good value for a 4-core system
-        if (configuration.getServerPassword().equals("auto")) {
-            ENCRYPTOR.setPassword(UUID.randomUUID().toString());
-        } else {
-            ENCRYPTOR.setPassword(configuration.getServerPassword());
-        }
-        ENCRYPTOR.setAlgorithm(configuration.getAlgorithm());
-        ENCRYPTOR.initialize();
-        BasicToken.defaultMaxAge = configuration.getMaxage();
-
-        //Create cache for permissions.
-        cache = CacheBuilder.newBuilder()
-                .expireAfterAccess(defaultMaxAge, TimeUnit.SECONDS)
-                .expireAfterWrite(defaultMaxAge, TimeUnit.SECONDS)
-                .build();
-
-    }
-
     /**
      * Creates an access token with the given parameters.
      *
@@ -91,6 +67,7 @@ public BasicToken(String userId, String username, DateTime expireAt, Map<String,
      */
     public BasicToken(String tokenString) throws Exception {
         try {
+            tokenString = tokenString.replaceAll("\"", "");
             tokenString = new String(Hex.decodeHex(tokenString.toCharArray()));
             String[] parts = ENCRYPTOR.decrypt(tokenString).split(SEPARATOR);
             this.userId = parts[0];
@@ -104,6 +81,39 @@ public BasicToken(String tokenString) throws Exception {
 
     }
 
+    /**
+     * Configure method for Token generation configurations and ENCRYPTOR configure
+     *
+     * @param configuration
+     */
+    public static void configure(TokenBasedAuthConfiguration configuration) {
+        ENCRYPTOR.setPoolSize(configuration.getPoolSize());          // This would be a good value for a 4-core system
+        if (configuration.getServerPassword().equals("auto")) {
+            ENCRYPTOR.setPassword(UUID.randomUUID().toString());
+        } else {
+            ENCRYPTOR.setPassword(configuration.getServerPassword());
+        }
+        ENCRYPTOR.setAlgorithm(configuration.getAlgorithm());
+        ENCRYPTOR.initialize();
+        BasicToken.defaultMaxAge = configuration.getMaxage();
+
+        //Create cache for permissions.
+        cache = CacheBuilder.newBuilder()
+                .expireAfterAccess(defaultMaxAge, TimeUnit.SECONDS)
+                .expireAfterWrite(defaultMaxAge, TimeUnit.SECONDS)
+                .build();
+
+    }
+
+    public static void clearPermissionCache(String username) {
+        cache.invalidate(username);
+        cache.cleanUp();
+    }
+
+    public static Set<String> getCurrentUsernames() {
+        cache.cleanUp();
+        return cache.asMap().keySet();
+    }
 
     @Override
     public String getUserId() {
@@ -184,6 +194,16 @@ public int getMaxAge() {
         return maxAge < 1 ? defaultMaxAge : maxAge;
     }
 
+    public void setMaxAge(int maxAge) {
+        if (maxAge < 1) maxAge = defaultMaxAge;
+        this.maxAge = maxAge;
+    }
+
+    @Override
+    public Set<String> getPermissions() {
+        return cache.getIfPresent(getUsername());
+    }
+
     /**
      * Sets permissions to the cache with current username
      *
@@ -194,17 +214,6 @@ public void setPermissions(Set<String> permissions) {
         cache.put(getUsername(), permissions);
     }
 
-    @Override
-    public Set<String> getPermissions() {
-        return cache.getIfPresent(getUsername());
-    }
-
-    public void setMaxAge(int maxAge) {
-        if (maxAge < 1) maxAge = defaultMaxAge;
-        this.maxAge = maxAge;
-    }
-
-
     private void resetTokenString() {
         tokenString = null;
     }
@@ -229,15 +238,4 @@ public int hashCode() {
         result = 31 * result + attributesHash.hashCode();
         return result;
     }
-
-
-    public static void clearPermissionCache(String username) {
-        cache.invalidate(username);
-        cache.cleanUp();
-    }
-
-    public static Set<String> getCurrentUsernames() {
-        cache.cleanUp();
-        return cache.asMap().keySet();
-    }
 }
diff --git a/robe-auth/src/main/java/io/robe/auth/tokenbased/TokenBasedAuthenticator.java b/robe-auth/src/main/java/io/robe/auth/tokenbased/TokenBasedAuthenticator.java
@@ -46,6 +46,7 @@ public TokenBasedAuthenticator(UserStore userStore, ServiceStore serviceStore) {
      */
     @Override
     public Optional<Token> authenticate(String tokenString) throws AuthenticationException {
+        tokenString = tokenString.replaceAll("\"", "");
         LOGGER.debug("Authenticating from database:  " + tokenString);
         try {
             // Decode tokenString and get user

diff --git a/robe-common/pom.xml b/robe-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>robe-parent</artifactId>
         <groupId>io.robe</groupId>
-        <version>0.4.5.3</version>
+        <version>0.4.5.4</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>