mirror of
https://github.com/wekan/wekan.git
synced 2026-11-18 05:45:02 -05:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
520304d560 | ||
|
|
be1ad7d041 | ||
|
|
f73eab23f9 | ||
|
|
9c2f782f84 | ||
|
|
0b891464b9 | ||
|
|
03439d1bcc | ||
|
|
6e9c8a174f | ||
|
|
ef84d798b5 | ||
|
|
a76f40a4d0 | ||
|
|
537e25df93 | ||
|
|
0764b46a02 | ||
|
|
b0f983dfa9 | ||
|
|
a3c7269d9e | ||
|
|
dc94618c26 | ||
|
|
37d0daee59 | ||
|
|
9225b61225 | ||
|
|
a0a8d0186c | ||
|
|
11dab6680d | ||
|
|
b431600d32 | ||
|
|
65ce948bb0 | ||
|
|
eb0c9ac1e6 | ||
|
|
752bd501bc | ||
|
|
542ec7b78b | ||
|
|
218855eebf | ||
|
|
f4a449b4ab |
No files matched your search
+1
-1
@@ -138,7 +138,7 @@ useraccounts:unstyled@1.14.2
|
||||
webapp@1.13.8
|
||||
webapp-hashing@1.1.1
|
||||
wekan-accounts-cas@0.1.0
|
||||
wekan-accounts-lockout@1.0.0
|
||||
wekan-accounts-lockout@1.1.0
|
||||
wekan-accounts-oidc@1.0.10
|
||||
wekan-accounts-sandstorm@0.8.0
|
||||
wekan-fontawesome@6.4.2
|
||||
|
||||
+25
-1
@@ -24,6 +24,30 @@ Those are fixed at WeKan 8.07 where database directory is back to /var/snap/weka
|
||||
|
||||
WeKan 8.00-8.24 used Colorful Unicode Emoji Icons, versions before and after use mostly Font Awesome 4.7 icons.
|
||||
|
||||
# v8.26 2026-01-31 WeKan ® release
|
||||
|
||||
This release adds the following updates:
|
||||
|
||||
- [Migrate wekan-accounts-lockout to async API for Meteor 3.0](https://github.com/wekan/wekan/pull/6113).
|
||||
Thanks to harryadel.
|
||||
- Added Docs: Spreadsheet vs Kanban.
|
||||
[Part 1](https://github.com/wekan/wekan/commit/a0a8d0186cbc7fefe38f72244723bcff292ae2f4),
|
||||
[Part 2](https://github.com/wekan/wekan/commit/37d0daee590ab48cbfa1672e4bc5efd95d341211).
|
||||
Thanks to xet7.
|
||||
- [Updated dependencies](https://github.com/wekan/wekan/commit/03439d1bccf82511870eed7301b621b1d495941b).
|
||||
Thanks to developers of dependencies.
|
||||
|
||||
and fixes the following bugs:
|
||||
|
||||
- [Reduce visual overflow in Member Settings menu by extending container height](https://github.com/wekan/wekan/pull/6104).
|
||||
Thanks to AymenHassini19.
|
||||
- [Fix Card copy menu is not displayed](https://github.com/wekan/wekan/commit/0b891464b907b272e075d8aafd3ce29e704739cf).
|
||||
Thanks to xet7.
|
||||
- [Fix Bug: Rules view translation not is not shown correctly](https://github.com/wekan/wekan/commit/f73eab23f997efe5347aa1f06515bf355cfe7ed5).
|
||||
Thanks to cactus7as and xet7.
|
||||
|
||||
Thanks to above GitHub users for their contributions and translators for their translations.
|
||||
|
||||
# v8.25 2026-01-28 WeKan ® release
|
||||
|
||||
This release fixes the following CRITICAL SECURITY ISSUES of [Floppybleed](https://wekan.fi/hall-of-fame/floppybleed/):
|
||||
@@ -50,7 +74,7 @@ and adds the following updates:
|
||||
[Part 5](https://github.com/wekan/wekan/commit/60846a44959d46262672c6a3048bd76d829c03bf),
|
||||
[Part 6](https://github.com/wekan/wekan/commit/7ff174cf660f43dfbb471b29d75820f527771bbd).
|
||||
Thanks to xet7.
|
||||
- [Most Unicode Icons back to Font Awesome 4.7 for better accessibility. Less always visible buttons, More at ☰ Mnu](https://github.com/wekan/wekan/commit/7ad04f45353e1628881fec310caedf7625a34d4d).
|
||||
- [Most Unicode Icons back to Font Awesome 4.7 for better accessibility. Less always visible buttons, More at ☰ Menu](https://github.com/wekan/wekan/commit/7ad04f45353e1628881fec310caedf7625a34d4d).
|
||||
Thanks to xet7.
|
||||
- [Updated to MongoDB 7.0.29 at Snap Candidate](https://github.com/wekan/wekan/commit/ac70fe28488c09364133a65fbc80f5a819a1e4bf).
|
||||
Thanks to developers of MongoDB.
|
||||
|
||||
+3
-3
@@ -196,9 +196,9 @@ ln -sf $(which bsdtar) $(which tar)
|
||||
# WeKan Bundle Installation
|
||||
mkdir -p /home/wekan/app
|
||||
cd /home/wekan/app
|
||||
wget "https://github.com/wekan/wekan/releases/download/v8.25/wekan-8.25-${WEKAN_ARCH}.zip"
|
||||
unzip "wekan-8.25-${WEKAN_ARCH}.zip"
|
||||
rm "wekan-8.25-${WEKAN_ARCH}.zip"
|
||||
wget "https://github.com/wekan/wekan/releases/download/v8.26/wekan-8.26-${WEKAN_ARCH}.zip"
|
||||
unzip "wekan-8.26-${WEKAN_ARCH}.zip"
|
||||
rm "wekan-8.26-${WEKAN_ARCH}.zip"
|
||||
mv /home/wekan/app/bundle /build
|
||||
|
||||
# Restore original tar
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
|
||||
appVersion: "v8.25.0"
|
||||
appVersion: "v8.26.0"
|
||||
files:
|
||||
userUploads:
|
||||
- README.md
|
||||
|
||||
@@ -93,6 +93,25 @@
|
||||
max-height: inherit;
|
||||
}
|
||||
|
||||
/* Fix overflow in the Member Settings (member menu) popup:
|
||||
the popup itself gets a max-height inline style, but the header consumes space.
|
||||
Make the header overlay the scrollable area so the list can't spill out. */
|
||||
.pop-over[data-popup="memberMenuPopup"] {
|
||||
overflow: hidden;
|
||||
}
|
||||
.pop-over[data-popup="memberMenuPopup"] > .header {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
margin-bottom: 0;
|
||||
z-index: 1;
|
||||
}
|
||||
.pop-over[data-popup="memberMenuPopup"] > .content-wrapper {
|
||||
padding-top: calc(4.5vh + 1vh);
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
/* Admin edit popups: use full height */
|
||||
.pop-over[data-popup="editUserPopup"],
|
||||
.pop-over[data-popup="editOrgPopup"],
|
||||
|
||||
@@ -11,7 +11,8 @@ template(name="rulesTriggers")
|
||||
li.js-set-card-triggers
|
||||
i.fa.fa-file-text-o
|
||||
li.js-set-checklist-triggers
|
||||
i.fa.fa-check .triggers-main-body
|
||||
i.fa.fa-check
|
||||
.triggers-main-body
|
||||
if showBoardTrigger.get
|
||||
+boardTriggers
|
||||
else if showCardTrigger.get
|
||||
|
||||
@@ -2,6 +2,11 @@ import { ReactiveCache } from '/imports/reactiveCache';
|
||||
import { DialogWithBoardSwimlaneList } from '/client/lib/dialogWithBoardSwimlaneList';
|
||||
|
||||
export class DialogWithBoardSwimlaneListCard extends DialogWithBoardSwimlaneList {
|
||||
constructor() {
|
||||
super();
|
||||
this.selectedCardId = new ReactiveVar('');
|
||||
}
|
||||
|
||||
getDefaultOption(boardId) {
|
||||
const ret = {
|
||||
'boardId' : "",
|
||||
|
||||
Binary file not shown.
Binary file not shown.
|
After Width: | Height: | Size: 780 KiB |
@@ -10,7 +10,7 @@ This is without container (without Docker or Snap).
|
||||
|
||||
Right click and download files 1-4:
|
||||
|
||||
1. [wekan-8.25-amd64-windows.zip](https://github.com/wekan/wekan/releases/download/v8.25/wekan-8.25-amd64-windows.zip)
|
||||
1. [wekan-8.26-amd64-windows.zip](https://github.com/wekan/wekan/releases/download/v8.26/wekan-8.26-amd64-windows.zip)
|
||||
|
||||
2. [node.exe](https://nodejs.org/dist/latest-v14.x/win-x64/node.exe)
|
||||
|
||||
@@ -22,7 +22,7 @@ Right click and download files 1-4:
|
||||
|
||||
6. Double click `mongodb-windows-x86_64-7.0.28-signed.msi` . In installer, uncheck downloading MongoDB compass.
|
||||
|
||||
7. Unzip `wekan-8.25-amd64-windows.zip` , inside it is directory `bundle`, to it copy other files:
|
||||
7. Unzip `wekan-8.26-amd64-windows.zip` , inside it is directory `bundle`, to it copy other files:
|
||||
|
||||
```
|
||||
bundle (directory)
|
||||
|
||||
@@ -173,10 +173,10 @@
|
||||
"boardInfoOnMyBoards-title": "הגדרות כל הלוחות",
|
||||
"show-card-counter-per-list": "הצגת מספור כרטיסים לפי רשימה",
|
||||
"show-board_members-avatar": "הצגת התמונות הייצוגיות של חברי הלוח",
|
||||
"board_members": "All board members",
|
||||
"card_members": "All members of current card at this board",
|
||||
"board_assignees": "All assignees of all cards at this board",
|
||||
"card_assignees": "All assignees of current card at this board",
|
||||
"board_members": "כל החברים בלוח",
|
||||
"card_members": "כל החברים של הכרטיס הנוכחי בלוח הזה",
|
||||
"board_assignees": "כל המוקצים לכל הכרטיסים בלוח הזה",
|
||||
"card_assignees": "כל המוקצים לכרטיס הנוכחי בלוח הזה",
|
||||
"board-nb-stars": "%s כוכבים",
|
||||
"board-not-found": "לוח לא נמצא",
|
||||
"board-private-info": "לוח זה יהיה <strong>פרטי</strong>.",
|
||||
@@ -1412,11 +1412,11 @@
|
||||
"filesystem-path-description": "נתיב בסיס לאחסון קבצים",
|
||||
"gridfs-enabled": "GridFS הופעל",
|
||||
"gridfs-enabled-description": "להשתמש ב־GridFS מבית MongoDB לאחסון קבצים",
|
||||
"all-migrations": "All Migrations",
|
||||
"select-migration": "Select Migration",
|
||||
"all-migrations": "כל ההסבות",
|
||||
"select-migration": "בחירת הסבה",
|
||||
"start": "התחלה",
|
||||
"pause": "Pause",
|
||||
"stop": "Stop",
|
||||
"pause": "השהיה",
|
||||
"stop": "עצירה",
|
||||
"migration-pause-failed": "השהיית ההסבות נכשלה",
|
||||
"migration-paused": "ההסבות הושהו בהצלחה",
|
||||
"migration-progress": "התקדמות הסבה",
|
||||
|
||||
@@ -59,7 +59,7 @@ if (Meteor.isServer) {
|
||||
await LockoutSettings._collection.createIndexAsync({ modifiedAt: -1 });
|
||||
|
||||
// Known users settings
|
||||
LockoutSettings.upsert(
|
||||
await LockoutSettings.upsertAsync(
|
||||
{ _id: 'known-failuresBeforeLockout' },
|
||||
{
|
||||
$setOnInsert: {
|
||||
@@ -71,7 +71,7 @@ if (Meteor.isServer) {
|
||||
},
|
||||
);
|
||||
|
||||
LockoutSettings.upsert(
|
||||
await LockoutSettings.upsertAsync(
|
||||
{ _id: 'known-lockoutPeriod' },
|
||||
{
|
||||
$setOnInsert: {
|
||||
@@ -83,7 +83,7 @@ if (Meteor.isServer) {
|
||||
},
|
||||
);
|
||||
|
||||
LockoutSettings.upsert(
|
||||
await LockoutSettings.upsertAsync(
|
||||
{ _id: 'known-failureWindow' },
|
||||
{
|
||||
$setOnInsert: {
|
||||
@@ -99,7 +99,7 @@ if (Meteor.isServer) {
|
||||
const typoVar = process.env.ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE;
|
||||
const correctVar = process.env.ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BEFORE;
|
||||
|
||||
LockoutSettings.upsert(
|
||||
await LockoutSettings.upsertAsync(
|
||||
{ _id: 'unknown-failuresBeforeLockout' },
|
||||
{
|
||||
$setOnInsert: {
|
||||
@@ -111,7 +111,7 @@ if (Meteor.isServer) {
|
||||
},
|
||||
);
|
||||
|
||||
LockoutSettings.upsert(
|
||||
await LockoutSettings.upsertAsync(
|
||||
{ _id: 'unknown-lockoutPeriod' },
|
||||
{
|
||||
$setOnInsert: {
|
||||
@@ -123,7 +123,7 @@ if (Meteor.isServer) {
|
||||
},
|
||||
);
|
||||
|
||||
LockoutSettings.upsert(
|
||||
await LockoutSettings.upsertAsync(
|
||||
{ _id: 'unknown-failureWindow' },
|
||||
{
|
||||
$setOnInsert: {
|
||||
|
||||
Generated
+4
-4
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "wekan",
|
||||
"version": "v8.25.0",
|
||||
"version": "v8.26.0",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
@@ -2861,9 +2861,9 @@
|
||||
}
|
||||
},
|
||||
"tar": {
|
||||
"version": "7.5.6",
|
||||
"resolved": "https://registry.npmjs.org/tar/-/tar-7.5.6.tgz",
|
||||
"integrity": "sha512-xqUeu2JAIJpXyvskvU3uvQW8PAmHrtXp2KDuMJwQqW8Sqq0CaZBAQ+dKS3RBXVhU4wC5NjAdKrmh84241gO9cA==",
|
||||
"version": "7.5.7",
|
||||
"resolved": "https://registry.npmjs.org/tar/-/tar-7.5.7.tgz",
|
||||
"integrity": "sha512-fov56fJiRuThVFXD6o6/Q354S7pnWMJIVlDBYijsTNx6jKSE4pvrDTs6lUnmGvNyfJwFQQwWy3owKz1ucIhveQ==",
|
||||
"requires": {
|
||||
"@isaacs/fs-minipass": "^4.0.0",
|
||||
"chownr": "^3.0.0",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "wekan",
|
||||
"version": "v8.25.0",
|
||||
"version": "v8.26.0",
|
||||
"description": "Open-Source kanban",
|
||||
"private": true,
|
||||
"repository": {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
Package.describe({
|
||||
name: 'wekan-accounts-lockout',
|
||||
version: '1.0.0',
|
||||
version: '1.1.0',
|
||||
summary: 'Meteor package for locking user accounts and stopping brute force attacks',
|
||||
git: 'https://github.com/lucasantoniassi/meteor-accounts-lockout.git',
|
||||
documentation: 'README.md',
|
||||
|
||||
@@ -9,12 +9,12 @@ class KnownUser {
|
||||
this.settings = settings;
|
||||
}
|
||||
|
||||
startup() {
|
||||
async startup() {
|
||||
if (!(this.unchangedSettings instanceof Function)) {
|
||||
this.updateSettings();
|
||||
}
|
||||
this.scheduleUnlocksForLockedAccounts();
|
||||
KnownUser.unlockAccountsIfLockoutAlreadyExpired();
|
||||
await this.scheduleUnlocksForLockedAccounts();
|
||||
await KnownUser.unlockAccountsIfLockoutAlreadyExpired();
|
||||
this.hookIntoAccounts();
|
||||
}
|
||||
|
||||
@@ -49,7 +49,7 @@ class KnownUser {
|
||||
}
|
||||
}
|
||||
|
||||
scheduleUnlocksForLockedAccounts() {
|
||||
async scheduleUnlocksForLockedAccounts() {
|
||||
const lockedAccountsCursor = Meteor.users.find(
|
||||
{
|
||||
'services.accounts-lockout.unlockTime': {
|
||||
@@ -63,7 +63,7 @@ class KnownUser {
|
||||
},
|
||||
);
|
||||
const currentTime = Number(new Date());
|
||||
lockedAccountsCursor.forEach((user) => {
|
||||
for await (const user of lockedAccountsCursor) {
|
||||
let lockDuration = KnownUser.unlockTime(user) - currentTime;
|
||||
if (lockDuration >= this.settings.lockoutPeriod) {
|
||||
lockDuration = this.settings.lockoutPeriod * 1000;
|
||||
@@ -75,10 +75,10 @@ class KnownUser {
|
||||
KnownUser.unlockAccount.bind(null, user._id),
|
||||
lockDuration,
|
||||
);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
static unlockAccountsIfLockoutAlreadyExpired() {
|
||||
static async unlockAccountsIfLockoutAlreadyExpired() {
|
||||
const currentTime = Number(new Date());
|
||||
const query = {
|
||||
'services.accounts-lockout.unlockTime': {
|
||||
@@ -91,7 +91,7 @@ class KnownUser {
|
||||
'services.accounts-lockout.failedAttempts': 0,
|
||||
},
|
||||
};
|
||||
Meteor.users.update(query, data);
|
||||
await Meteor.users.updateAsync(query, data);
|
||||
}
|
||||
|
||||
hookIntoAccounts() {
|
||||
@@ -100,7 +100,7 @@ class KnownUser {
|
||||
}
|
||||
|
||||
|
||||
validateLoginAttempt(loginInfo) {
|
||||
async validateLoginAttempt(loginInfo) {
|
||||
if (
|
||||
// don't interrupt non-password logins
|
||||
loginInfo.type !== 'password' ||
|
||||
@@ -130,12 +130,12 @@ class KnownUser {
|
||||
const canReset = (currentTime - firstFailedAttempt) > (1000 * this.settings.failureWindow);
|
||||
if (canReset) {
|
||||
failedAttempts = 1;
|
||||
KnownUser.resetAttempts(failedAttempts, userId);
|
||||
await KnownUser.resetAttempts(failedAttempts, userId);
|
||||
}
|
||||
|
||||
const canIncrement = failedAttempts < this.settings.failuresBeforeLockout;
|
||||
if (canIncrement) {
|
||||
KnownUser.incrementAttempts(failedAttempts, userId);
|
||||
await KnownUser.incrementAttempts(failedAttempts, userId);
|
||||
}
|
||||
|
||||
const maxAttemptsAllowed = this.settings.failuresBeforeLockout;
|
||||
@@ -147,7 +147,7 @@ class KnownUser {
|
||||
KnownUser.tooManyAttempts(duration);
|
||||
}
|
||||
if (failedAttempts === maxAttemptsAllowed) {
|
||||
this.setNewUnlockTime(failedAttempts, userId);
|
||||
await this.setNewUnlockTime(failedAttempts, userId);
|
||||
|
||||
let duration = this.settings.lockoutPeriod;
|
||||
duration = Math.ceil(duration);
|
||||
@@ -161,7 +161,7 @@ class KnownUser {
|
||||
);
|
||||
}
|
||||
|
||||
static resetAttempts(
|
||||
static async resetAttempts(
|
||||
failedAttempts,
|
||||
userId,
|
||||
) {
|
||||
@@ -174,10 +174,10 @@ class KnownUser {
|
||||
'services.accounts-lockout.firstFailedAttempt': currentTime,
|
||||
},
|
||||
};
|
||||
Meteor.users.update(query, data);
|
||||
await Meteor.users.updateAsync(query, data);
|
||||
}
|
||||
|
||||
static incrementAttempts(
|
||||
static async incrementAttempts(
|
||||
failedAttempts,
|
||||
userId,
|
||||
) {
|
||||
@@ -189,10 +189,10 @@ class KnownUser {
|
||||
'services.accounts-lockout.lastFailedAttempt': currentTime,
|
||||
},
|
||||
};
|
||||
Meteor.users.update(query, data);
|
||||
await Meteor.users.updateAsync(query, data);
|
||||
}
|
||||
|
||||
setNewUnlockTime(
|
||||
async setNewUnlockTime(
|
||||
failedAttempts,
|
||||
userId,
|
||||
) {
|
||||
@@ -206,14 +206,14 @@ class KnownUser {
|
||||
'services.accounts-lockout.unlockTime': newUnlockTime,
|
||||
},
|
||||
};
|
||||
Meteor.users.update(query, data);
|
||||
await Meteor.users.updateAsync(query, data);
|
||||
Meteor.setTimeout(
|
||||
KnownUser.unlockAccount.bind(null, userId),
|
||||
this.settings.lockoutPeriod * 1000,
|
||||
);
|
||||
}
|
||||
|
||||
static onLogin(loginInfo) {
|
||||
static async onLogin(loginInfo) {
|
||||
if (loginInfo.type !== 'password') {
|
||||
return;
|
||||
}
|
||||
@@ -225,7 +225,7 @@ class KnownUser {
|
||||
'services.accounts-lockout.failedAttempts': 0,
|
||||
},
|
||||
};
|
||||
Meteor.users.update(query, data);
|
||||
await Meteor.users.updateAsync(query, data);
|
||||
}
|
||||
|
||||
static incorrectPassword(
|
||||
@@ -306,7 +306,7 @@ class KnownUser {
|
||||
return firstFailedAttempt || 0;
|
||||
}
|
||||
|
||||
static unlockAccount(userId) {
|
||||
static async unlockAccount(userId) {
|
||||
const query = { _id: userId };
|
||||
const data = {
|
||||
$unset: {
|
||||
@@ -314,7 +314,7 @@ class KnownUser {
|
||||
'services.accounts-lockout.failedAttempts': 0,
|
||||
},
|
||||
};
|
||||
Meteor.users.update(query, data);
|
||||
await Meteor.users.updateAsync(query, data);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -13,12 +13,12 @@ class UnknownUser {
|
||||
this.settings = settings;
|
||||
}
|
||||
|
||||
startup() {
|
||||
async startup() {
|
||||
if (!(this.settings instanceof Function)) {
|
||||
this.updateSettings();
|
||||
}
|
||||
this.scheduleUnlocksForLockedAccounts();
|
||||
this.unlockAccountsIfLockoutAlreadyExpired();
|
||||
await this.scheduleUnlocksForLockedAccounts();
|
||||
await this.unlockAccountsIfLockoutAlreadyExpired();
|
||||
this.hookIntoAccounts();
|
||||
}
|
||||
|
||||
@@ -53,7 +53,7 @@ class UnknownUser {
|
||||
}
|
||||
}
|
||||
|
||||
scheduleUnlocksForLockedAccounts() {
|
||||
async scheduleUnlocksForLockedAccounts() {
|
||||
const lockedAccountsCursor = this.AccountsLockoutCollection.find(
|
||||
{
|
||||
'services.accounts-lockout.unlockTime': {
|
||||
@@ -67,8 +67,8 @@ class UnknownUser {
|
||||
},
|
||||
);
|
||||
const currentTime = Number(new Date());
|
||||
lockedAccountsCursor.forEach((connection) => {
|
||||
let lockDuration = this.unlockTime(connection) - currentTime;
|
||||
for await (const connection of lockedAccountsCursor) {
|
||||
let lockDuration = await this.unlockTime(connection) - currentTime;
|
||||
if (lockDuration >= this.settings.lockoutPeriod) {
|
||||
lockDuration = this.settings.lockoutPeriod * 1000;
|
||||
}
|
||||
@@ -79,10 +79,10 @@ class UnknownUser {
|
||||
this.unlockAccount.bind(this, connection.clientAddress),
|
||||
lockDuration,
|
||||
);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
unlockAccountsIfLockoutAlreadyExpired() {
|
||||
async unlockAccountsIfLockoutAlreadyExpired() {
|
||||
const currentTime = Number(new Date());
|
||||
const query = {
|
||||
'services.accounts-lockout.unlockTime': {
|
||||
@@ -95,7 +95,7 @@ class UnknownUser {
|
||||
'services.accounts-lockout.failedAttempts': 0,
|
||||
},
|
||||
};
|
||||
this.AccountsLockoutCollection.update(query, data);
|
||||
await this.AccountsLockoutCollection.updateAsync(query, data);
|
||||
}
|
||||
|
||||
hookIntoAccounts() {
|
||||
@@ -103,7 +103,7 @@ class UnknownUser {
|
||||
Accounts.onLogin(this.onLogin.bind(this));
|
||||
}
|
||||
|
||||
validateLoginAttempt(loginInfo) {
|
||||
async validateLoginAttempt(loginInfo) {
|
||||
// don't interrupt non-password logins
|
||||
if (
|
||||
loginInfo.type !== 'password' ||
|
||||
@@ -120,20 +120,20 @@ class UnknownUser {
|
||||
}
|
||||
|
||||
const clientAddress = loginInfo.connection.clientAddress;
|
||||
const unlockTime = this.unlockTime(loginInfo.connection);
|
||||
let failedAttempts = 1 + this.failedAttempts(loginInfo.connection);
|
||||
const firstFailedAttempt = this.firstFailedAttempt(loginInfo.connection);
|
||||
const unlockTime = await this.unlockTime(loginInfo.connection);
|
||||
let failedAttempts = 1 + await this.failedAttempts(loginInfo.connection);
|
||||
const firstFailedAttempt = await this.firstFailedAttempt(loginInfo.connection);
|
||||
const currentTime = Number(new Date());
|
||||
|
||||
const canReset = (currentTime - firstFailedAttempt) > (1000 * this.settings.failureWindow);
|
||||
if (canReset) {
|
||||
failedAttempts = 1;
|
||||
this.resetAttempts(failedAttempts, clientAddress);
|
||||
await this.resetAttempts(failedAttempts, clientAddress);
|
||||
}
|
||||
|
||||
const canIncrement = failedAttempts < this.settings.failuresBeforeLockout;
|
||||
if (canIncrement) {
|
||||
this.incrementAttempts(failedAttempts, clientAddress);
|
||||
await this.incrementAttempts(failedAttempts, clientAddress);
|
||||
}
|
||||
|
||||
const maxAttemptsAllowed = this.settings.failuresBeforeLockout;
|
||||
@@ -145,7 +145,7 @@ class UnknownUser {
|
||||
UnknownUser.tooManyAttempts(duration);
|
||||
}
|
||||
if (failedAttempts === maxAttemptsAllowed) {
|
||||
this.setNewUnlockTime(failedAttempts, clientAddress);
|
||||
await this.setNewUnlockTime(failedAttempts, clientAddress);
|
||||
|
||||
let duration = this.settings.lockoutPeriod;
|
||||
duration = Math.ceil(duration);
|
||||
@@ -159,7 +159,7 @@ class UnknownUser {
|
||||
);
|
||||
}
|
||||
|
||||
resetAttempts(
|
||||
async resetAttempts(
|
||||
failedAttempts,
|
||||
clientAddress,
|
||||
) {
|
||||
@@ -172,10 +172,10 @@ class UnknownUser {
|
||||
'services.accounts-lockout.firstFailedAttempt': currentTime,
|
||||
},
|
||||
};
|
||||
this.AccountsLockoutCollection.upsert(query, data);
|
||||
await this.AccountsLockoutCollection.upsertAsync(query, data);
|
||||
}
|
||||
|
||||
incrementAttempts(
|
||||
async incrementAttempts(
|
||||
failedAttempts,
|
||||
clientAddress,
|
||||
) {
|
||||
@@ -187,10 +187,10 @@ class UnknownUser {
|
||||
'services.accounts-lockout.lastFailedAttempt': currentTime,
|
||||
},
|
||||
};
|
||||
this.AccountsLockoutCollection.upsert(query, data);
|
||||
await this.AccountsLockoutCollection.upsertAsync(query, data);
|
||||
}
|
||||
|
||||
setNewUnlockTime(
|
||||
async setNewUnlockTime(
|
||||
failedAttempts,
|
||||
clientAddress,
|
||||
) {
|
||||
@@ -204,14 +204,14 @@ class UnknownUser {
|
||||
'services.accounts-lockout.unlockTime': newUnlockTime,
|
||||
},
|
||||
};
|
||||
this.AccountsLockoutCollection.upsert(query, data);
|
||||
await this.AccountsLockoutCollection.upsertAsync(query, data);
|
||||
Meteor.setTimeout(
|
||||
this.unlockAccount.bind(this, clientAddress),
|
||||
this.settings.lockoutPeriod * 1000,
|
||||
);
|
||||
}
|
||||
|
||||
onLogin(loginInfo) {
|
||||
async onLogin(loginInfo) {
|
||||
if (loginInfo.type !== 'password') {
|
||||
return;
|
||||
}
|
||||
@@ -223,7 +223,7 @@ class UnknownUser {
|
||||
'services.accounts-lockout.failedAttempts': 0,
|
||||
},
|
||||
};
|
||||
this.AccountsLockoutCollection.update(query, data);
|
||||
await this.AccountsLockoutCollection.updateAsync(query, data);
|
||||
}
|
||||
|
||||
static userNotFound(
|
||||
@@ -264,14 +264,14 @@ class UnknownUser {
|
||||
return unknownUsers || false;
|
||||
}
|
||||
|
||||
findOneByConnection(connection) {
|
||||
return this.AccountsLockoutCollection.findOne({
|
||||
async findOneByConnection(connection) {
|
||||
return await this.AccountsLockoutCollection.findOneAsync({
|
||||
clientAddress: connection.clientAddress,
|
||||
});
|
||||
}
|
||||
|
||||
unlockTime(connection) {
|
||||
connection = this.findOneByConnection(connection);
|
||||
async unlockTime(connection) {
|
||||
connection = await this.findOneByConnection(connection);
|
||||
let unlockTime;
|
||||
try {
|
||||
unlockTime = connection.services['accounts-lockout'].unlockTime;
|
||||
@@ -281,8 +281,8 @@ class UnknownUser {
|
||||
return unlockTime || 0;
|
||||
}
|
||||
|
||||
failedAttempts(connection) {
|
||||
connection = this.findOneByConnection(connection);
|
||||
async failedAttempts(connection) {
|
||||
connection = await this.findOneByConnection(connection);
|
||||
let failedAttempts;
|
||||
try {
|
||||
failedAttempts = connection.services['accounts-lockout'].failedAttempts;
|
||||
@@ -292,8 +292,8 @@ class UnknownUser {
|
||||
return failedAttempts || 0;
|
||||
}
|
||||
|
||||
lastFailedAttempt(connection) {
|
||||
connection = this.findOneByConnection(connection);
|
||||
async lastFailedAttempt(connection) {
|
||||
connection = await this.findOneByConnection(connection);
|
||||
let lastFailedAttempt;
|
||||
try {
|
||||
lastFailedAttempt = connection.services['accounts-lockout'].lastFailedAttempt;
|
||||
@@ -303,8 +303,8 @@ class UnknownUser {
|
||||
return lastFailedAttempt || 0;
|
||||
}
|
||||
|
||||
firstFailedAttempt(connection) {
|
||||
connection = this.findOneByConnection(connection);
|
||||
async firstFailedAttempt(connection) {
|
||||
connection = await this.findOneByConnection(connection);
|
||||
let firstFailedAttempt;
|
||||
try {
|
||||
firstFailedAttempt = connection.services['accounts-lockout'].firstFailedAttempt;
|
||||
@@ -314,7 +314,7 @@ class UnknownUser {
|
||||
return firstFailedAttempt || 0;
|
||||
}
|
||||
|
||||
unlockAccount(clientAddress) {
|
||||
async unlockAccount(clientAddress) {
|
||||
const query = { clientAddress };
|
||||
const data = {
|
||||
$unset: {
|
||||
@@ -322,7 +322,7 @@ class UnknownUser {
|
||||
'services.accounts-lockout.failedAttempts': 0,
|
||||
},
|
||||
};
|
||||
this.AccountsLockoutCollection.update(query, data);
|
||||
await this.AccountsLockoutCollection.updateAsync(query, data);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
|
||||
appTitle = (defaultText = "Wekan"),
|
||||
# The name of the app as it is displayed to the user.
|
||||
|
||||
appVersion = 825,
|
||||
appVersion = 826,
|
||||
# Increment this for every release.
|
||||
|
||||
appMarketingVersion = (defaultText = "8.25.0~2026-01-28"),
|
||||
appMarketingVersion = (defaultText = "8.26.0~2026-01-31"),
|
||||
# Human-readable presentation of the app version.
|
||||
|
||||
minUpgradableAppVersion = 0,
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
import { AccountsLockout } from 'meteor/wekan-accounts-lockout';
|
||||
import LockoutSettings from '/models/lockoutSettings';
|
||||
|
||||
Meteor.startup(() => {
|
||||
Meteor.startup(async () => {
|
||||
// Wait for the database to be ready
|
||||
Meteor.setTimeout(() => {
|
||||
Meteor.setTimeout(async () => {
|
||||
try {
|
||||
// Get configurations from database
|
||||
const knownUsersConfig = {
|
||||
failuresBeforeLockout: LockoutSettings.findOne('known-failuresBeforeLockout')?.value || 3,
|
||||
lockoutPeriod: LockoutSettings.findOne('known-lockoutPeriod')?.value || 60,
|
||||
failureWindow: LockoutSettings.findOne('known-failureWindow')?.value || 15
|
||||
failuresBeforeLockout: (await LockoutSettings.findOneAsync('known-failuresBeforeLockout'))?.value || 3,
|
||||
lockoutPeriod: (await LockoutSettings.findOneAsync('known-lockoutPeriod'))?.value || 60,
|
||||
failureWindow: (await LockoutSettings.findOneAsync('known-failureWindow'))?.value || 15
|
||||
};
|
||||
|
||||
const unknownUsersConfig = {
|
||||
failuresBeforeLockout: LockoutSettings.findOne('unknown-failuresBeforeLockout')?.value || 3,
|
||||
lockoutPeriod: LockoutSettings.findOne('unknown-lockoutPeriod')?.value || 60,
|
||||
failureWindow: LockoutSettings.findOne('unknown-failureWindow')?.value || 15
|
||||
failuresBeforeLockout: (await LockoutSettings.findOneAsync('unknown-failuresBeforeLockout'))?.value || 3,
|
||||
lockoutPeriod: (await LockoutSettings.findOneAsync('unknown-lockoutPeriod'))?.value || 60,
|
||||
failureWindow: (await LockoutSettings.findOneAsync('unknown-failureWindow'))?.value || 15
|
||||
};
|
||||
|
||||
// Initialize the AccountsLockout with configuration
|
||||
|
||||
@@ -2,7 +2,7 @@ import { ReactiveCache } from '/imports/reactiveCache';
|
||||
|
||||
// Method to find locked users and release them if needed
|
||||
Meteor.methods({
|
||||
getLockedUsers() {
|
||||
async getLockedUsers() {
|
||||
// Check if user has admin rights
|
||||
const userId = Meteor.userId();
|
||||
if (!userId) {
|
||||
@@ -17,7 +17,7 @@ Meteor.methods({
|
||||
const currentTime = Number(new Date());
|
||||
|
||||
// Find users that are locked (known users)
|
||||
const lockedUsers = Meteor.users.find(
|
||||
const lockedUsers = await Meteor.users.find(
|
||||
{
|
||||
'services.accounts-lockout.unlockTime': {
|
||||
$gt: currentTime,
|
||||
@@ -32,7 +32,7 @@ Meteor.methods({
|
||||
'services.accounts-lockout.failedAttempts': 1
|
||||
}
|
||||
}
|
||||
).fetch();
|
||||
).fetchAsync();
|
||||
|
||||
// Format the results for the UI
|
||||
return lockedUsers.map(user => {
|
||||
@@ -50,7 +50,7 @@ Meteor.methods({
|
||||
});
|
||||
},
|
||||
|
||||
unlockUser(userId) {
|
||||
async unlockUser(userId) {
|
||||
// Check if user has admin rights
|
||||
const adminId = Meteor.userId();
|
||||
if (!adminId) {
|
||||
@@ -62,13 +62,13 @@ Meteor.methods({
|
||||
}
|
||||
|
||||
// Make sure the user to unlock exists
|
||||
const userToUnlock = Meteor.users.findOne(userId);
|
||||
const userToUnlock = await Meteor.users.findOneAsync(userId);
|
||||
if (!userToUnlock) {
|
||||
throw new Meteor.Error('error-user-not-found', 'User not found');
|
||||
}
|
||||
|
||||
// Unlock the user
|
||||
Meteor.users.update(
|
||||
await Meteor.users.updateAsync(
|
||||
{ _id: userId },
|
||||
{
|
||||
$unset: {
|
||||
@@ -80,7 +80,7 @@ Meteor.methods({
|
||||
return true;
|
||||
},
|
||||
|
||||
unlockAllUsers() {
|
||||
async unlockAllUsers() {
|
||||
// Check if user has admin rights
|
||||
const adminId = Meteor.userId();
|
||||
if (!adminId) {
|
||||
@@ -92,7 +92,7 @@ Meteor.methods({
|
||||
}
|
||||
|
||||
// Unlock all users
|
||||
Meteor.users.update(
|
||||
await Meteor.users.updateAsync(
|
||||
{ 'services.accounts-lockout.unlockTime': { $exists: true } },
|
||||
{
|
||||
$unset: {
|
||||
|
||||
@@ -3,7 +3,7 @@ import { ReactiveCache } from '/imports/reactiveCache';
|
||||
import LockoutSettings from '/models/lockoutSettings';
|
||||
|
||||
Meteor.methods({
|
||||
reloadAccountsLockout() {
|
||||
async reloadAccountsLockout() {
|
||||
// Check if user has admin rights
|
||||
const userId = Meteor.userId();
|
||||
if (!userId) {
|
||||
@@ -17,15 +17,15 @@ Meteor.methods({
|
||||
try {
|
||||
// Get configurations from database
|
||||
const knownUsersConfig = {
|
||||
failuresBeforeLockout: LockoutSettings.findOne('known-failuresBeforeLockout')?.value || 3,
|
||||
lockoutPeriod: LockoutSettings.findOne('known-lockoutPeriod')?.value || 60,
|
||||
failureWindow: LockoutSettings.findOne('known-failureWindow')?.value || 15
|
||||
failuresBeforeLockout: (await LockoutSettings.findOneAsync('known-failuresBeforeLockout'))?.value || 3,
|
||||
lockoutPeriod: (await LockoutSettings.findOneAsync('known-lockoutPeriod'))?.value || 60,
|
||||
failureWindow: (await LockoutSettings.findOneAsync('known-failureWindow'))?.value || 15
|
||||
};
|
||||
|
||||
const unknownUsersConfig = {
|
||||
failuresBeforeLockout: LockoutSettings.findOne('unknown-failuresBeforeLockout')?.value || 3,
|
||||
lockoutPeriod: LockoutSettings.findOne('unknown-lockoutPeriod')?.value || 60,
|
||||
failureWindow: LockoutSettings.findOne('unknown-failureWindow')?.value || 15
|
||||
failuresBeforeLockout: (await LockoutSettings.findOneAsync('unknown-failuresBeforeLockout'))?.value || 3,
|
||||
lockoutPeriod: (await LockoutSettings.findOneAsync('unknown-lockoutPeriod'))?.value || 60,
|
||||
failureWindow: (await LockoutSettings.findOneAsync('unknown-failureWindow'))?.value || 15
|
||||
};
|
||||
|
||||
// Initialize the AccountsLockout with configuration
|
||||
|
||||
+4
-4
@@ -1,5 +1,5 @@
|
||||
name: wekan
|
||||
version: '8.25'
|
||||
version: '8.26'
|
||||
base: core24
|
||||
summary: Open Source kanban
|
||||
description: |
|
||||
@@ -166,9 +166,9 @@ parts:
|
||||
# Cleanup
|
||||
mkdir .build
|
||||
cd .build
|
||||
wget https://github.com/wekan/wekan/releases/download/v8.25/wekan-8.25-amd64.zip
|
||||
unzip wekan-8.25-amd64.zip
|
||||
rm wekan-8.25-amd64.zip
|
||||
wget https://github.com/wekan/wekan/releases/download/v8.26/wekan-8.26-amd64.zip
|
||||
unzip wekan-8.26-amd64.zip
|
||||
rm wekan-8.26-amd64.zip
|
||||
cd ..
|
||||
##cd .build/bundle
|
||||
##find . -type d -name '*-garbage*' | xargs rm -rf
|
||||
|
||||
Reference in new issue
Block a user