35 Commits

Author SHA1 Message Date
Alice Gaudon bce1796115 Merge branch 'develop' 4 months ago
Alice Gaudon 97c87a96f4 Version 2.4.2 4 months ago
Alice Gaudon e7d28000a4 Install and upgrade dependencies 4 months ago
Alice Gaudon 87dbcf7e3c Merge branch 'boilerplate' into develop 4 months ago
Alice Gaudon 679e8ab769 Make max public domain identity per user configurable, default unlimited 4 months ago
Alice Gaudon 827e7644fa Merge branch 'develop' 5 months ago
Alice Gaudon efbc895ba3 Bump @types/node 5 months ago
Alice Gaudon 2cb5b6f8f9 Replace node-sass with sass 5 months ago
Alice Gaudon f5d135d331 Merge branch 'develop' 5 months ago
Alice Gaudon 82439366ba Fix imagemin peer dependency of img-loader 5 months ago
Alice Gaudon 162f884103 Upgrade dependencies 5 months ago
Alice Gaudon 00bb24cf2e Update repository url 5 months ago
Alice Gaudon 911008af8b Merge branch 'develop' 6 months ago
Alice Gaudon 6399573432 Version 2.4.1 6 months ago
Alice Gaudon 14edb62823 Update to latest swaf changes on UserNameComponent 6 months ago
Alice Gaudon 84081ccd8c Upgrade dependencies 6 months ago
Alice Gaudon 2bf70ca9e1 Merge branch 'boilerplate' into develop 6 months ago
Alice Gaudon f90208c74e Fix user list not appearing in domains backend 6 months ago
Alice Gaudon 4bcee79e8a Merge branch 'develop' 6 months ago
Alice Gaudon d223c9c77f Update config to new swaf version 6 months ago
Alice Gaudon faa728aacb layout.scss: allow .form-field to be hidden with .hidden 6 months ago
Alice Gaudon 00b1f25804 Merge branch 'develop' 6 months ago
Alice Gaudon 12f82f0f3d package.json: use NodeJS scripts instead of unix commands 6 months ago
Alice Gaudon ceaa0769bc Upgrade dependencies 6 months ago
Alice Gaudon 0f83dd7ad6 layout.scss: add pagination default style 6 months ago
Alice Gaudon 959e5ca276 Remove duplicate definition of .copyable-text and improve table layout 8 months ago
Alice Gaudon 1cdd118806 Merge branch 'develop' 8 months ago
Alice Gaudon 145d8df70a css: move menu .tip visibility to layout.scss 8 months ago
Alice Gaudon 2726fd16cc Merge branch 'develop' 8 months ago
Alice Gaudon 8612b0f33a css: move lighter theme to layout.scss and make header css mobile first 8 months ago
Alice Gaudon bda464ab16 css: move a hover color and td.actions improvements to layout.scss 8 months ago
Alice Gaudon e7165edafd Add hover color on warning buttons 8 months ago
Alice Gaudon 16394c0d4c Set icon size for titles 8 months ago
Alice Gaudon d2a67a12ee Fix subpanel leaking out of their container 8 months ago
Alice Gaudon 1043690a5d Add bigger container max-width for desktop view 8 months ago
  1. 1
      .eslintrc.json
  2. 2
      assets/sass/_vars.scss
  3. 75
      assets/sass/layout.scss
  4. 140
      config/default.json5
  5. 80
      config/production.json5
  6. 3
      config/test.json5
  7. 24
      package.json
  8. 10
      scripts/clean.js
  9. 4
      scripts/prepare-sources.js
  10. 2
      src/App.ts
  11. 11
      src/controllers/AccountMailboxController.ts
  12. 2
      src/controllers/backend/AccountBackendController.ts
  13. 20
      src/controllers/backend/MailboxBackendController.ts
  14. 3
      src/models/MailDomain.ts
  15. 3
      src/models/UserMailIdentityComponent.ts
  16. 3033
      yarn.lock

1
.eslintrc.json

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

2
assets/sass/_vars.scss

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

75
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;
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 {
width: 0;
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;
}
}
}
}
}

140
config/default.json5

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

80
config/production.json5

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

3
config/test.json5

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

24
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)",
"prepareSources": "cp package.json src/",
"clean": "node scripts/clean.js",
"prepare-sources": "node scripts/prepare-sources.js",
"compile": "yarn clean && tsc",
"build": "yarn prepareSources && 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\"",
"build": "yarn prepare-sources && yarn compile && webpack --mode production",
"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"

10
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});
}
});

4
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'));

2
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,
];
}

11
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

2
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'));
}
}

20
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,
}))],
});
}

3
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();
}
}

3
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> {

3033
yarn.lock
File diff suppressed because it is too large
View File

Loading…
Cancel
Save