jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Group names can contain - and end with .app

Browse Source 
now that we have decoupled it from mailbox names, this restriction
can be removed
This commit is contained in:
Girish Ramakrishnan
2018-06-14 22:20:09 -07:00
parent eb566d28e7
commit 5e09f3dcb2
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/groups.js
+2 -5
View File
@@ -64,11 +64,8 @@ function validateGroupname(name) {
if (constants.RESERVED_NAMES.indexOf(name) !== -1) return new GroupsError(GroupsError.BAD_FIELD, 'name is reserved');
// +/- can be tricky in emails. also need to consider valid LDAP characters here (e.g '+' is reserved)
if (/[^a-zA-Z0-9.]/.test(name)) return new GroupsError(GroupsError.BAD_FIELD, 'name can only contain alphanumerals and dot');
// app emails are sent using the .app suffix
if (name.indexOf('.app') !== -1) return new GroupsError(GroupsError.BAD_FIELD, 'name pattern is reserved for apps');
// need to consider valid LDAP characters here (e.g '+' is reserved)
if (/[^a-zA-Z0-9.-]/.test(name)) return new GroupsError(GroupsError.BAD_FIELD, 'name can only contain alphanumerals, hyphen and dot');
return null;
}
src/test/groups-test.js
+2 -2
View File
@@ -108,7 +108,7 @@ describe('Groups', function () {
});
it('cannot create group - invalid', function (done) {
groups.create('cloudron-admin', function (error) {
groups.create('cloudron+admin', function (error) {
expect(error.reason).to.be(GroupsError.BAD_FIELD);
done();
});
@@ -124,7 +124,7 @@ describe('Groups', function () {
it('cannot create existing group with mixed case', function (done) {
var name = GROUP0_NAME[0].toUpperCase() + GROUP0_NAME.substr(1);
groups.create(name, function (error, result) {
groups.create(name, function (error) {
expect(error.reason).to.be(GroupsError.ALREADY_EXISTS);
done();
});