hostsharing/hs.hsadmin
8
1
Fork 0
Code Pull Requests Activity

allow padc user

Browse Source
This commit is contained in:
Peter Hormanns 2016-01-11 12:37:36 +01:00
parent f1caa45dcf
commit d70b87cf28
4 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hsarback/src/de/hsadmin/mods/email/EMailAlias.java
View File

@ -48,7 +48,7 @@ public class EMailAlias extends AbstractEntity implements Serializable {
@AnnFieldIO(validation="[a-z0-9]*", rw=ReadWriteAccess.READONLY)
private Pac pac;
@AnnFieldIO(validation="[a-z0-9]{5}-[a-z0-9\\.\\_\\+]{1,}", rw=ReadWriteAccess.WRITEONCE)
@AnnFieldIO(validation="[a-z0-9]{5}(-[a-z0-9\\.\\_]{1,})?", rw=ReadWriteAccess.WRITEONCE)
@Column(updatable=false)
private String name;

2
hsarback/src/de/hsadmin/mods/user/UnixUser.java
View File

@ -40,7 +40,7 @@ public class UnixUser extends AbstractEntity implements Serializable {
@Column(name="userid", columnDefinition="integer", nullable=false, updatable=false)
private long userId;
@AnnFieldIO(validation="[a-z0-9]{5}-[a-z0-9\\.\\_]{1,}", rw=ReadWriteAccess.WRITEONCE)
@AnnFieldIO(validation="[a-z0-9]{5}(-[a-z0-9\\.\\_]{1,})?", rw=ReadWriteAccess.WRITEONCE)
@Column(name="name", columnDefinition = "character varying(24)", unique=true, updatable=false)
private String name;

20
hsarback/test/de/hsadmin/validate/PacName.java
View File

@ -1,20 +0,0 @@
package de.hsadmin.validate;
import java.util.regex.Pattern;
public class PacName {
public static void main(String[] args) {
Pattern pattern = Pattern.compile("[a-z0-9]{5}-[a-z0-9\\.\\_]{1,}");
System.out.println("xyz00-a.b " + pattern.matcher("xyz00-a.b").matches());
System.out.println("xyz00-a-b " + pattern.matcher("xyz00-a-b").matches());
System.out.println("xyz00-a.B " + pattern.matcher("xyz00-a.B").matches());
System.out.println("xyz00- " + pattern.matcher("xyz00-").matches());
System.out.println("xyz00 " + pattern.matcher("xyz00").matches());
System.out.println("xyz0 " + pattern.matcher("xyz0").matches());
System.out.println("xyz00_a " + pattern.matcher("xyz00_a").matches());
System.out.println("xyz00-a.b:c " + pattern.matcher("xyz00-a.b:c").matches());
}
}

36
hsarback/test/de/hsadmin/validate/PacNameTest.java Normal file
View File

@ -0,0 +1,36 @@
package de.hsadmin.validate;
import java.util.regex.Pattern;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class PacNameTest {
private Pattern pattern;
@Before
public void setUp() throws Exception {
pattern = Pattern.compile("[a-z0-9]{5}(-[a-z0-9\\.\\_]{1,})?");
}
@After
public void tearDown() throws Exception {
pattern = null;
}
@Test
public void test() {
Assert.assertTrue("xyz00-a.b", pattern.matcher("xyz00-a.b").matches());
Assert.assertFalse("xyz00-a-b", pattern.matcher("xyz00-a-b").matches());
Assert.assertFalse("xyz00-a.B", pattern.matcher("xyz00-a.B").matches());
Assert.assertFalse("xyz00-", pattern.matcher("xyz00-").matches());
Assert.assertTrue("xyz00", pattern.matcher("xyz00").matches());
Assert.assertFalse("xyz0", pattern.matcher("xyz0").matches());
Assert.assertFalse("xyz00_a", pattern.matcher("xyz00_a").matches());
Assert.assertFalse("xyz00-a.b:c", pattern.matcher("xyz00-a.b:c").matches());
}
}