HSAdmin Backend Domains, E-Mail, Datenbanken
Peter Hormanns
2016-01-11 d70b87cf28cb4a84ade90c3b73253997cc9b1672
allow padc user
2 files modified
1 files added
1 files deleted
60 ■■■■■ changed files
hsarback/src/de/hsadmin/mods/email/EMailAlias.java 2 ●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/user/UnixUser.java 2 ●●● patch | view | raw | blame | history
hsarback/test/de/hsadmin/validate/PacName.java 20 ●●●●● patch | view | raw | blame | history
hsarback/test/de/hsadmin/validate/PacNameTest.java 36 ●●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/email/EMailAlias.java
@@ -48,7 +48,7 @@
    @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;
hsarback/src/de/hsadmin/mods/user/UnixUser.java
@@ -40,7 +40,7 @@
    @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;
hsarback/test/de/hsadmin/validate/PacName.java
File was deleted
hsarback/test/de/hsadmin/validate/PacNameTest.java
New 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());
    }
}