Merge branch 'develop'

.eslintrc.json

@@ -88,6 +88,7 @@
   },
   "ignorePatterns": [
     "jest.config.js",
+    "scripts/**/*",
     "webpack.config.js",
     "dist/**/*",
     "public/**/*",

assets/sass/_vars.scss

@@ -30,4 +30,4 @@ $errorColor: desaturate($errorText, 50%);
 
 // Responsivity
 $mobileThreshold: 632px;
-$desktopThreshold: 632px;
+$desktopThreshold: 940px;

assets/sass/layout.scss

@@ -173,6 +173,15 @@ body > header {
 						font-weight: inherit;
 						background: transparent;
 					}
+
+					&:hover {
+						.tip {
+							visibility: visible;
+							opacity: 1;
+							transition: opacity ease-out 100ms;
+							transition-delay: 150ms;
+						}
+					}
 				}
 
 				button {
@@ -398,7 +407,7 @@ form {
 	padding: 8px 16px;
 	text-align: center;
 
-	.form-field {
+	.form-field:not(.hidden) {
 		display: flex;
 		flex-direction: column;
 		margin: 16px auto;
@@ -693,6 +702,7 @@ td.actions {
 
 	th {
 		border-bottom: 1px solid #39434a;
+		white-space: nowrap;
 	}
 
 	tr:nth-child(even) {
@@ -859,37 +869,7 @@ td.actions {
 	}
 
 	.content {
-		overflow: hidden;
+		width: 0;
-		white-space: nowrap;
-		padding: 8px;
-	}
-
-	.copy-button {
-		margin: 0;
-		padding: 0;
-		border-radius: 0;
-
-		.feather {
-			--icon-size: 20px;
-			margin: 8px;
-		}
-	}
-}
-
-.copyable-text {
-	display: flex;
-	flex-direction: row;
-	margin: 8px;
-
-	background-color: darken($backgroundColor, 2%);
-	border-radius: 5px;
-	overflow: hidden;
-
-	.title {
-		padding: 8px;
-	}
-
-	.content {
 		flex-grow: 1;
 		overflow: hidden;
 		white-space: nowrap;
@@ -939,3 +919,34 @@ td.actions {
 		background: $secondary;
 	}
 }
+
+.table-col-grow {
+	width: 100%;
+}
+
+.pagination {
+	ul {
+		display: flex;
+		flex-direction: row;
+		list-style: none;
+		padding: 8px;
+
+		justify-content: center;
+
+		li {
+			a, &.active, &.ellipsis {
+				display: block;
+				min-width: 40px;
+				height: 40px;
+				padding: 4px;
+
+				line-height: 32px;
+				text-align:center;
+
+				&:hover:not(.active):not(.ellipsis) {
+					background-color: #fff5;
+				}
+			}
+		}
+	}
+}

config/default.json5

@@ -1,69 +1,75 @@
 {
-    app: {
+	app: {
-        name: 'Rainbox Email',
+		name: 'Rainbox Email',
-        contact_email: 'contact@rainbox.email',
+		contact_email: 'contact@rainbox.email',
-        webmail_url: 'https://rc.rainbox.email',
+		webmail_url: 'https://rc.rainbox.email',
-    },
+	},
-    log_level: "DEV",
+	log_level: "DEV",
-    db_log_level: "ERROR",
+	db_log_level: "ERROR",
-    public_url: "http://localhost:4899",
+	public_url: "http://localhost:4899",
-    public_websocket_url: "ws://localhost:4899",
+	public_websocket_url: "ws://localhost:4899",
-    port: 4899,
+	port: 4899,
-    mysql: {
+	mysql: {
-        connectionLimit: 10,
+		connectionLimit: 10,
-        host: "localhost",
+		host: "localhost",
-        user: "root",
+		user: "root",
-        password: "",
+		password: "",
-        database: "rainbox_email",
+		database: "rainbox_email",
-        create_database_automatically: false,
+		create_database_automatically: false,
-    },
+	},
-    redis: {
+	redis: {
-        host: "127.0.0.1",
+		host: "127.0.0.1",
-        port: 6379,
+		port: 6379,
-        prefix: 'rainbox.email',
+		prefix: 'rainbox.email',
-    },
+	},
-    session: {
+	session: {
-        cookie: {
+		cookie: {
-            secure: false,
+			secure: false,
-        },
+		},
-    },
+	},
-    mail: {
+	mail: {
-        host: "127.0.0.1",
+		host: "127.0.0.1",
-        port: "1025",
+		port: "1025",
-        secure: false,
+		secure: false,
-        username: "",
+		username: "",
-        password: "",
+		password: "",
-        allow_invalid_tls: true,
+		allow_invalid_tls: true,
-        from: 'contact@rainbox.email',
+		from: 'contact@rainbox.email',
-        from_name: 'Rainbox Email',
+		from_name: 'Rainbox Email',
-    },
+		// Unlimited
-    view: {
+		max_public_identities_per_user: -1,
-        cache: false,
+	},
-    },
+	view: {
-    approval_mode: false,
+		cache: false,
-    magic_link: {
+	},
-        validity_period: 20,
+	auth: {
-    },
+		approval_mode: false,
-    mail_autoconfig: {
+		// 30 days
-        main_domain: 'localhost',
+		name_change_wait_period: 2592000000,
-        display_name: 'Rainbox Email',
+	},
-        display_name_short: 'Rainbox',
+	magic_link: {
-        username: '%EMAILADDRESS%',
+		validity_period: 20,
-        auth_method: 'password-cleartext',
+	},
-        imap: {
+	mail_autoconfig: {
-            server: 'localhost',
+		main_domain: 'localhost',
-            port: '143',
+		display_name: 'Rainbox Email',
-            method: 'STARTTLS',
+		display_name_short: 'Rainbox',
-        },
+		username: '%EMAILADDRESS%',
-        pop3: {
+		auth_method: 'password-cleartext',
-            server: 'localhost',
+		imap: {
-            port: '110',
+			server: 'localhost',
-            method: 'STARTTLS',
+			port: '143',
-        },
+			method: 'STARTTLS',
-        smtp: {
+		},
-            server: 'localhost',
+		pop3: {
-            port: '587',
+			server: 'localhost',
-            method: 'STARTTLS',
+			port: '110',
-        },
+			method: 'STARTTLS',
-    },
+		},
+		smtp: {
+			server: 'localhost',
+			port: '587',
+			method: 'STARTTLS',
+		},
+	},
 }

config/production.json5

@@ -1,41 +1,43 @@
 {
-    log_level: "DEBUG",
+	log_level: "DEBUG",
-    db_log_level: "ERROR",
+	db_log_level: "ERROR",
-    public_url: "https://rainbox.email",
+	public_url: "https://rainbox.email",
-    public_websocket_url: "wss://rainbox.email",
+	public_websocket_url: "wss://rainbox.email",
-    session: {
+	session: {
-        cookie: {
+		cookie: {
-            secure: true
+			secure: true,
-        }
+		},
-    },
+	},
-    mail: {
+	mail: {
-        secure: true,
+		secure: true,
-        allow_invalid_tls: false
+		allow_invalid_tls: false,
-    },
+	},
-    approval_mode: true,
+	auth: {
-    magic_link: {
+		approval_mode: true,
-        validity_period: 900,
+	},
-    },
+	magic_link: {
-    mail_autoconfig: {
+		validity_period: 900,
-        main_domain: 'rainbox.email',
+	},
-        display_name: 'Rainbox Email',
+	mail_autoconfig: {
-        display_name_short: 'Rainbox',
+		main_domain: 'rainbox.email',
-        username: '%EMAILADDRESS%',
+		display_name: 'Rainbox Email',
-        auth_method: 'password-cleartext',
+		display_name_short: 'Rainbox',
-        imap: {
+		username: '%EMAILADDRESS%',
-            server: 'rainbox.email',
+		auth_method: 'password-cleartext',
-            port: '143',
+		imap: {
-            method: 'STARTTLS',
+			server: 'rainbox.email',
-        },
+			port: '143',
-        pop3: {
+			method: 'STARTTLS',
-            server: 'rainbox.email',
+		},
-            port: '110',
+		pop3: {
-            method: 'STARTTLS',
+			server: 'rainbox.email',
-        },
+			port: '110',
-        smtp: {
+			method: 'STARTTLS',
-            server: 'rainbox.email',
+		},
-            port: '587',
+		smtp: {
-            method: 'STARTTLS',
+			server: 'rainbox.email',
-        },
+			port: '587',
-    },
+			method: 'STARTTLS',
+		},
+	},
 }

config/test.json5

@@ -6,4 +6,7 @@
         database: "rainbox_email_test",
         create_database_automatically: true
     },
+    mail: {
+        max_public_identities_per_user: 1,
+    },
 }

package.json

@@ -1,20 +1,20 @@
 {
   "name": "rainbox.email",
-  "version": "2.4.0",
+  "version": "2.4.2",
   "description": "ISP mail provider manager with mysql and integrated LDAP server",
-  "repository": "https://gitlab.com/ArisuOngaku/rainbox.email",
+  "repository": "https://eternae.ink/ashpie/rainbox.email",
   "author": "Alice Gaudon <alice@gaudon.pro>",
   "main": "dist/main.js",
   "license": "AGPL-3.0-only",
   "scripts": {
     "test": "jest --verbose --runInBand",
-    "clean": "(test ! -d dist || rm -r dist)",
+    "clean": "node scripts/clean.js",
-    "prepareSources": "cp package.json src/",
+    "prepare-sources": "node scripts/prepare-sources.js",
     "compile": "yarn clean && tsc",
-    "build": "yarn prepareSources && yarn compile && webpack --mode production",
+    "build": "yarn prepare-sources && yarn compile && webpack --mode production",
-    "dev": "yarn prepareSources && concurrently -k -n \"Typescript,Node,Webpack,Maildev\" -p \"[{name}]\" -c \"blue,green,red,yellow\" \"tsc --watch\" \"nodemon\" \"webpack --watch --mode development\" \"maildev\"",
+    "dev": "yarn prepare-sources && concurrently -k -n \"Typescript,Node,Webpack,Maildev\" -p \"[{name}]\" -c \"blue,green,red,yellow\" \"tsc --watch\" \"nodemon\" \"webpack --watch --mode development\" \"maildev\"",
     "start": "yarn build && node",
-    "lint": "eslint . --ext .js,.jsx,.ts,.tsx"
+    "lint": "eslint ."
   },
   "devDependencies": {
     "@babel/core": "^7.9.0",
@@ -28,7 +28,7 @@
     "@types/jest": "^26.0.4",
     "@types/ldapjs": "^1.0.7",
     "@types/mysql": "^2.15.15",
-    "@types/node": "^14.6.3",
+    "@types/node": "^15.0.1",
     "@types/nodemailer": "^6.4.0",
     "@types/nunjucks": "^3.1.3",
     "@types/ws": "^7.2.6",
@@ -40,21 +40,21 @@
     "eslint": "^7.10.0",
     "feather-icons": "^4.28.0",
     "file-loader": "^6.0.0",
-    "imagemin": "^7.0.1",
+    "imagemin": "^7.0.0",
     "imagemin-gifsicle": "^7.0.0",
     "imagemin-mozjpeg": "^9.0.0",
     "imagemin-pngquant": "^9.0.0",
-    "imagemin-svgo": "^8.0.0",
+    "imagemin-svgo": "^9.0.0",
     "img-loader": "^3.0.1",
     "jest": "^26.1.0",
     "maildev": "^1.1.0",
     "mini-css-extract-plugin": "^1.2.1",
-    "node-sass": "^5.0.0",
     "nodemon": "^2.0.3",
+    "sass": "^1.32.12",
     "sass-loader": "^11.0.1",
     "terser-webpack-plugin": "^5.0.3",
     "ts-jest": "^26.1.1",
-    "ts-loader": "^8.0.4",
+    "ts-loader": "^9.1.0",
     "typescript": "^4.0.2",
     "webpack": "^5.3.2",
     "webpack-cli": "^4.1.0"

scripts/clean.js

@@ -0,0 +1,10 @@
+const fs = require('fs');
+
+[
+    'dist',
+].forEach(file => {
+    if (fs.existsSync(file)) {
+        console.log('Cleaning', file, '...');
+        fs.rmSync(file, {recursive: true});
+    }
+});

scripts/prepare-sources.js

@@ -0,0 +1,4 @@
+const fs = require('fs');
+const path = require('path');
+
+fs.copyFileSync('package.json', path.join('src', 'package.json'));

src/App.ts

@@ -42,6 +42,7 @@ import AccountController from "swaf/auth/AccountController";
 import packageJson = require('./package.json');
 import AddUsedToMagicLinksMigration from "swaf/auth/magic_link/AddUsedToMagicLinksMigration";
 import MakeMagicLinksSessionNotUniqueMigration from "swaf/auth/magic_link/MakeMagicLinksSessionNotUniqueMigration";
+import AddNameChangedAtToUsersMigration from "swaf/auth/migrations/AddNameChangedAtToUsersMigration";
 
 export default class App extends Application {
     public constructor(
@@ -66,6 +67,7 @@ export default class App extends Application {
             DropLegacyLogsTable,
             AddUsedToMagicLinksMigration,
             MakeMagicLinksSessionNotUniqueMigration,
+            AddNameChangedAtToUsersMigration,
         ];
     }
 

src/controllers/AccountMailboxController.ts

@@ -57,21 +57,20 @@ export default class AccountMailboxController extends Controller {
         });
 
         // Check whether this identity can be created by this user
+        if (!domain.canCreateAddresses(user)) {
+            throw new ForbiddenHttpError('domain', req.url);
+        }
         if (domain.isPublic()) {
             await Validator.validate({
-                name: new Validator<string>().defined().equals(user.as(UserNameComponent).name),
+                name: new Validator<string>().defined().equals(user.as(UserNameComponent).getName()),
             }, req.body);
             const actualPublicAddressesCount = await mailIdentityComponent.getPublicAddressesCount();
             const maxPublicAddressesCount = mailIdentityComponent.getMaxPublicAddressesCount();
-            if (actualPublicAddressesCount >= maxPublicAddressesCount) {
+            if (maxPublicAddressesCount >= 0 && actualPublicAddressesCount >= maxPublicAddressesCount) {
                 req.flash('error', 'You have reached maximum public email addresses.');
                 res.redirect(Controller.route('account-mailbox'));
                 return;
             }
-        } else {
-            if (!domain.canCreateAddresses(user)) {
-                throw new ForbiddenHttpError('domain', req.url);
-            }
         }
 
         // Save identity

src/controllers/backend/AccountBackendController.ts

@@ -59,7 +59,7 @@ export default class AccountBackendController extends Controller {
         await user.as(UserPasswordComponent).setPassword(req.body.new_password, 'new_password');
         await user.save();
 
-        req.flash('success', `New password set for ${user.as(UserNameComponent).name}`);
+        req.flash('success', `New password set for ${user.as(UserNameComponent).getName()}`);
         res.redirect(Controller.route('backend-list-users'));
     }
 }

src/controllers/backend/MailboxBackendController.ts

@@ -52,16 +52,9 @@ export default class MailboxBackendController extends Controller {
             .get();
 
         res.render('backend/mailboxes', {
-            users: [{
-                value: 0,
-                display: 'Public',
-            }, ...(await User.select().get()).map(u => ({
-                value: u.id,
-                display: u.name,
-            }))],
             mailboxes: await Promise.all(users.map(async user => ({
                 id: user.id,
-                username: user.as(UserNameComponent).name,
+                username: user.as(UserNameComponent).getName(),
                 name: await (await user.as(UserMailIdentityComponent).mainMailIdentity.get())?.toEmail(),
                 identity_count: (await user.as(UserMailIdentityComponent).mailIdentities.get()).length,
                 domain_count: (await user.as(UserMailIdentityComponent).mailDomains.get()).length,
@@ -82,7 +75,7 @@ export default class MailboxBackendController extends Controller {
         res.render('backend/mailbox', {
             mailbox: {
                 id: user.id,
-                userName: user.as(UserNameComponent).name,
+                userName: user.as(UserNameComponent).getName(),
                 name: await mainMailIdentity?.toEmail() || 'Not created.',
                 exists: !!mainMailIdentity,
             },
@@ -107,9 +100,16 @@ export default class MailboxBackendController extends Controller {
             domains: await Promise.all(mailDomains.map(async domain => ({
                 id: domain.id,
                 name: domain.name,
-                owner_name: (await domain.owner.get())?.as(UserNameComponent).name,
+                owner_name: (await domain.owner.get())?.as(UserNameComponent).getName(),
                 identity_count: (await domain.identities.get()).length,
             }))),
+            users: [{
+                value: 0,
+                display: 'Public',
+            }, ...(await User.select().get()).map(u => ({
+                value: u.id,
+                display: u.name,
+            }))],
         });
     }
 

src/models/MailDomain.ts

@@ -2,6 +2,7 @@ import Model from "swaf/db/Model";
 import User from "swaf/auth/models/User";
 import {ManyModelRelation, OneModelRelation} from "swaf/db/ModelRelation";
 import MailIdentity from "./MailIdentity";
+import UserNameComponent from "swaf/auth/models/UserNameComponent";
 
 export default class MailDomain extends Model {
     public id?: number = undefined;
@@ -38,6 +39,6 @@ export default class MailDomain extends Model {
     }
 
     public canCreateAddresses(user: User): boolean {
-        return this.user_id === user.id || this.isPublic();
+        return this.user_id === user.id || this.isPublic() && user.as(UserNameComponent).hasName();
     }
 }

src/models/UserMailIdentityComponent.ts

@@ -3,6 +3,7 @@ import User from "swaf/auth/models/User";
 import {ManyModelRelation, OneModelRelation} from "swaf/db/ModelRelation";
 import MailIdentity from "./MailIdentity";
 import MailDomain from "./MailDomain";
+import config from "config";
 
 export default class UserMailIdentityComponent extends ModelComponent<User> {
     public main_mail_identity_id?: number = undefined;
@@ -27,7 +28,7 @@ export default class UserMailIdentityComponent extends ModelComponent<User> {
         });
 
     public getMaxPublicAddressesCount(): number {
-        return 1;
+        return config.get<number>('mail.max_public_identities_per_user');
     }
 
     public async getPublicAddressesCount(): Promise<number> {