Merge branch 'release/v1.8.1-1'

Author: sklein94

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.8.1-1] - 2022-10-20
+### Fixed
+- in User Managment  an empty Password will not suffice for lowercase and minimum lenght of 9 or less (#67)
+
 ## [v1.8.0-1] - 2022-09-28
 ### Changed
 - Prevent system groups (admin/cesManager) from being deleted (#65)

Dockerfile

@@ -8,7 +8,7 @@ RUN set -x \
 FROM registry.cloudogu.com/official/java:8u302-3
 
 LABEL NAME="official/usermgt" \
-   VERSION="1.8.0-1" \
+   VERSION="1.8.1-1" \
    maintainer="[email protected]"
 
 # mark as webapp for nginx

Makefile

@@ -1,6 +1,6 @@
 # Set these to the desired values
 ARTIFACT_ID=usermgt
-VERSION=1.8.0-1
+VERSION=1.8.1-1
 # overwrite ADDITIONAL_LDFLAGS to disable static compilation
 # this should fix https://github.com/golang/go/issues/13470
 ADDITIONAL_LDFLAGS=""

app/src/main/java/de/triology/universeadm/group/GroupResource.java

@@ -1,16 +1,16 @@
-/* 
+/*
  * Copyright (c) 2013 - 2014, TRIOLOGY GmbH
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -21,7 +21,7 @@
  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * http://www.scm-manager.com
  */
 
@@ -31,107 +31,87 @@
 import de.triology.universeadm.AbstractManagerResource;
 import de.triology.universeadm.user.User;
 import de.triology.universeadm.user.UserManager;
-import org.json.simple.JSONArray;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
- *
  * @author Sebastian Sdorra <[email protected]>
  */
 @Path("groups")
-public class GroupResource extends AbstractManagerResource<Group>
-{
+public class GroupResource extends AbstractManagerResource<Group> {
 
   private static final Logger logger = LoggerFactory.getLogger(GroupResource.class);
 
   private final GroupManager groupManager;
   private final UserManager userManager;
-  
+
   @Inject
-  public GroupResource(GroupManager groupManager, UserManager userManager)
-  {
+  public GroupResource(GroupManager groupManager, UserManager userManager) {
     super(groupManager);
     this.groupManager = groupManager;
     this.userManager = userManager;
   }
 
   @Override
-  protected String getId(Group group)
-  {
+  protected String getId(Group group) {
     return group.getName();
   }
 
   @Override
-  protected void prepareForModify(String id, Group group)
-  {
+  protected void prepareForModify(String id, Group group) {
     group.setName(id);
   }
-  
+
   @POST
   @Path("{name}/members/{member}")
-  public Response addMember(@PathParam("name") String name, @PathParam("member") String member)
-  {
+  public Response addMember(@PathParam("name") String name, @PathParam("member") String member) {
     Response.ResponseBuilder builder;
-    
+
     Group group = groupManager.get(name);
     User user = userManager.get(member);
-    if ( group == null )
-    {
+    if (group == null) {
       builder = Response.status(Response.Status.NOT_FOUND);
-    }
-    else if (user == null){
+    } else if (user == null) {
       builder = Response.status(Response.Status.BAD_REQUEST);
-    }
-    else if ( group.getMembers().contains(member) )
-    {
+    } else if (group.getMembers().contains(member)) {
       builder = Response.status(Response.Status.CONFLICT);
-    }
-    else 
-    {
+    } else {
       group.getMembers().add(member);
       groupManager.modify(group);
       builder = Response.noContent();
     }
-    
+
     return builder.build();
   }
-  
+
   @DELETE
   @Path("{name}/members/{member}")
-  public Response removeMember(@PathParam("name") String name, @PathParam("member") String member)
-  {
+  public Response removeMember(@PathParam("name") String name, @PathParam("member") String member) {
     Response.ResponseBuilder builder;
-    
+
     Group group = groupManager.get(name);
-    if ( group == null )
-    {
+    if (group == null) {
       builder = Response.status(Response.Status.NOT_FOUND);
-    }
-    else if ( ! group.getMembers().contains(member) )
-    {
+    } else if (!group.getMembers().contains(member)) {
       builder = Response.status(Response.Status.CONFLICT);
-    }
-    else 
-    {
+    } else {
       group.getMembers().remove(member);
       groupManager.modify(group);
       builder = Response.noContent();
     }
-    
+
     return builder.build();
   }
 
   @GET
   @Path("undeletable")
   @Produces(MediaType.APPLICATION_JSON)
-  public Response getUndeletable(){
+  public Response getUndeletable() {
     Response.ResponseBuilder builder;
     try {
       List<String> groups = UndeletableGroupManager.getNonDeleteClassList();

app/src/main/webapp/scripts/passwordpolicy/services.js

@@ -35,11 +35,15 @@ angular.module('universeadm.passwordpolicy.services', ['restangular'])
           var rules = policy.Rules;
           var violations = [];
           var invalidRules = [];
+          var password = $scope.user.password;
+          if (password === undefined){
+            password = '';
+          }
           try {
             rules.forEach(function (rule) {
               try {
                 var regEx = new RegExp(rule.Rule);
-                if (!regEx.test($scope.user.password)) {
+                if (!regEx.test(password)) {
                   violations.push(rule);
                 }
               } catch (e) {

dogu.json

@@ -1,6 +1,6 @@
 {
   "Name": "official/usermgt",
-  "Version": "1.8.0-1",
+  "Version": "1.8.1-1",
   "DisplayName": "User Management",
   "Description": "User and Group Management.",
   "Category": "Administration Apps",

integrationTests/cypress/support/step_definitions/then.js

@@ -47,8 +47,7 @@ Then("the password entry is marked as valid", function () {
 });
 
 Then("all password rules are marked as not fullfilled", function () {
-    // Actually, there should be 5 unfulfilled rules. But unfortunately there is a bug: with an empty password, a rule is still marked as valid.
-    cy.get('p[data-testid="password-policy-rules"]').children('span[ng-repeat="violation in passwordPolicy.violations"]').should('have.length', 4)
+    cy.get('p[data-testid="password-policy-rules"]').children('span[ng-repeat="violation in passwordPolicy.violations"]').should('have.length', 5)
 });
 
 Then("all password rules are marked as fullfilled", function () {