Compare commits

...
25 Commits
Author SHA1 Message Date
Lauri Ojansivu 5c81cfbd7b v6.41 2022-08-28 19:35:22 +03:00
Lauri Ojansivu edc610d019 Updated ChangeLog. 2022-08-28 12:28:10 -04:00
Lauri Ojansivu 5ca84d2930 Try to fix EasySearch syntax.
Thanks to xet7 !
2022-08-28 12:26:22 -04:00
Lauri Ojansivu 6f864c5022 v6.40 2022-08-25 21:42:15 +03:00
Lauri Ojansivu 3c3adef26a Updated translations. 2022-08-25 21:36:01 +03:00
Lauri Ojansivu f533aa8d8e Updated ChangeLog. 2022-08-25 21:34:48 +03:00
Lauri Ojansivu c1d449d3bd Merge pull request #4657 from mfilser/move_copy_card_didnt_set_the_last_selected_board_right
Move/Copy Card dialog didn't set the last selected board right
2022-08-25 21:12:29 +03:00
Martin Filser 2c2f906c8b Move/Copy Card dialog didn't set the last selected board right
- fixes: #4655
2022-08-24 22:46:50 +02:00
Lauri Ojansivu 9e0d7ee00f Updated translations. 2022-08-22 20:23:21 +03:00
Lauri Ojansivu 11e467618d v6.39 2022-08-21 20:16:03 +03:00
Lauri Ojansivu f315721fef Updated ChangeLog. 2022-08-21 19:33:25 +03:00
Lauri Ojansivu 8eb4ffea89 Merge pull request #4650 from mfilser/attachment_using_new_feature_of_meteor-files-2.3.0
Attachment using new feature of Meteor Files 2.3.0
2022-08-21 19:09:52 +03:00
Lauri Ojansivu f20ca31a3f Merge pull request #4649 from repmovs/master
set miniscreen to 250px
2022-08-21 19:09:28 +03:00
Martin Filser f4e11ff7c5 Avatars, use same namingFunction as Attachments 2022-08-21 11:10:27 +02:00
Martin Filser f6fbd0a5c2 Attachment, rename not needed anymore since Meteor-Files 2.3.0
Thanks to @dr-dimitru
https://github.com/wekan/wekan/pull/4638#issuecomment-1217883870

https://github.com/veliovgroup/Meteor-Files/commit/00ab6f723b84eb596b366c5d26e6981a00377809
2022-08-21 11:10:27 +02:00
Martin Filser 25443926d3 Attachment, path was wrong if the file hasn't a extension 2022-08-21 11:10:27 +02:00
Repmovs 03a75c9c05 set miniscreen to 250px 2022-08-20 17:08:50 +00:00
Lauri Ojansivu 6a20f6dc70 Updated translations. 2022-08-20 16:50:55 +03:00
Lauri Ojansivu 3d2fbf1397 Updated ChangeLog. 2022-08-20 16:50:25 +03:00
Lauri Ojansivu d0f1382055 Upgraded Snap candidate MongoDB versions.
Thanks to MongoDB developers !
2022-08-20 16:48:43 +03:00
Lauri Ojansivu 0de353508a Updated ChangeLog. 2022-08-20 16:45:49 +03:00
Lauri Ojansivu c291b9ebb8 Merge pull request #4648 from NotTheEvilOne/pr/support-upload-avatar-validation
Add support to validate avatar uploads by type, size and external program
2022-08-20 16:43:46 +03:00
Tobias Wolf 24566ce853 Reset avatar if removed 2022-08-20 09:01:18 +02:00
Tobias Wolf c64a221453 Add support to validate uploaded avatars 2022-08-20 08:46:41 +02:00
Tobias Wolf 469d81f8a5 Separate uploaded file validation logic from the model "Attachments" 2022-08-19 14:30:22 +02:00
37 changed files with 289 additions and 121 deletions

No files matched your search

+3
View File
@@ -33,6 +33,9 @@ ENV \
ATTACHMENTS_UPLOAD_EXTERNAL_PROGRAM="" \
ATTACHMENTS_UPLOAD_MIME_TYPES="" \
ATTACHMENTS_UPLOAD_MAX_SIZE=0 \
AVATARS_UPLOAD_EXTERNAL_PROGRAM="" \
AVATARS_UPLOAD_MIME_TYPES="" \
AVATARS_UPLOAD_MAX_SIZE=0 \
MAX_IMAGE_PIXEL="" \
IMAGE_COMPRESS_RATIO="" \
NOTIFICATION_TRAY_AFTER_READ_DAYS_BEFORE_REMOVE="" \
+1 -1
View File
@@ -81,7 +81,7 @@ konecty:mongo-counter
percolate:synced-cron
cfs:filesystem
ostrio:cookies
ostrio:files@2.0.1
ostrio:files@2.3.0
rajit:bootstrap3-datepicker-fi
rajit:bootstrap3-datepicker-ar
rajit:bootstrap3-datepicker-bg
+39
View File
@@ -5,6 +5,45 @@ Download section.
[How to upgrade WeKan](https://github.com/wekan/wekan/issues/4585)
# v6.41 2022-08-28 WeKan ® release
This release fixes the following bugs:
- [Try to fix EasySearch syntax](https://github.com/wekan/wekan/commit/5ca84d293080c682de9c23c6754f142e7f3cd383).
Thanks to xet7.
Thanks to above GitHub users for their contributions and translators for their translations.
# v6.40 2022-08-25 WeKan ® release
This release fixes the following bugs:
- [Move/Copy Card dialog didn't set the last selected board right](https://github.com/wekan/wekan/pull/4657).
Thanks to mfilser.
Thanks to above GitHub users for their contributions and translators for their translations.
# v6.39 2022-08-21 WeKan ® release
This release adds the following new features:
- [Add support to validate avatar uploads by type, size and external program](https://github.com/wekan/wekan/pull/4648).
Thanks to NotTheEvilOne.
- [Attachment using new feature of Meteor Files 2.3.0](https://github.com/wekan/wekan/pull/4650).
Thanks to mfilser.
and adds the following updates:
- [Upgraded Snap candidate MongoDB versions](https://github.com/wekan/wekan/commit/d0f1382055278a2f78fd9d53b0dd5c3daaaf23fd).
Thanks to MongoDB developers.
and fixes the following bugs:
- [Set miniscreen to 250px to get Mobile Android Firefox working](https://github.com/wekan/wekan/pull/4649).
Thanks to repmovs.
Thanks to above GitHub users for their contributions and translators for their translations.
# v6.38 2022-08-18 WeKan ® release
This release adds the following new features:
+3
View File
@@ -36,6 +36,9 @@ ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-
ATTACHMENTS_UPLOAD_EXTERNAL_PROGRAM="" \
ATTACHMENTS_UPLOAD_MIME_TYPES="" \
ATTACHMENTS_UPLOAD_MAX_SIZE=0 \
AVATARS_UPLOAD_EXTERNAL_PROGRAM="" \
AVATARS_UPLOAD_MIME_TYPES="" \
AVATARS_UPLOAD_MAX_SIZE=0 \
RICHER_CARD_COMMENT_EDITOR=false \
CARD_OPENED_WEBHOOK_ENABLED=false \
MAX_IMAGE_PIXEL="" \
+1 -1
View File
@@ -1,5 +1,5 @@
appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
appVersion: "v6.38.0"
appVersion: "v6.41.0"
files:
userUploads:
- README.md
+1 -2
View File
@@ -32,11 +32,10 @@
animation: fadeIn 0.2s;
z-index: 16;
}
.board-wrapper .board-canvas.is-dragging-active .open-minicard-composer,
.board-wrapper .board-canvas.is-dragging-active .minicard-wrapper.is-checked {
display: none;
}
@media screen and (max-width: 800px) {
@media screen and (max-width: 250px) {
.board-wrapper .board-canvas .swimlane {
border-bottom: 1px solid #ccc;
display: flex;
+1 -4
View File
@@ -736,10 +736,7 @@ template(name="copyAndMoveCard")
label {{_ 'boards'}}:
select.js-select-boards(autofocus)
each boards
if $eq _id currentBoard._id
option(value="{{_id}}" selected) {{_ 'current'}}
else
option(value="{{_id}}" selected="{{#if isDialogOptionBoardId _id}}selected{{/if}}") {{title}}
option(value="{{_id}}" selected="{{#if isDialogOptionBoardId _id}}selected{{/if}}") {{title}}
label {{_ 'swimlanes'}}:
select.js-select-swimlanes
+1 -1
View File
@@ -311,5 +311,5 @@ BlazeComponent.extendComponent({
}).register('importMapMembersAddPopup');
Template.importMapMembersAddPopup.helpers({
searchIndex: () => Users.search_index,
searchIndex: () => UserSearchIndex,
})
+2 -2
View File
@@ -6,7 +6,7 @@
background: #dedede;
border-left: 1px solid #ccc;
padding: 0;
float: left;
float: left;
min-width: 270px;
max-width: 270px;
/* Reverted incomplete change list width: */
@@ -159,7 +159,7 @@
#js-wip-limit-edit div {
float: left;
}
@media screen and (max-width: 800px) {
@media screen and (max-width: 250px) {
.mini-list {
flex: 0 0 60px;
height: auto;
+1 -1
View File
@@ -1391,7 +1391,7 @@ BlazeComponent.extendComponent({
}).register('addMemberPopup');
Template.addMemberPopup.helpers({
searchIndex: () => Users.search_index,
searchIndex: () => UserSearchIndex,
})
BlazeComponent.extendComponent({
@@ -46,7 +46,6 @@
background: #dedede;
display: flex;
flex-direction: row;
overflow: 0;
max-height: calc(100% - 26px);
}
.swimlane.placeholder {
+2 -9
View File
@@ -3,7 +3,6 @@ import Avatars from '/models/avatars';
import Users from '/models/users';
import Org from '/models/org';
import Team from '/models/team';
import { formatFleURL } from 'meteor/ostrio:files/lib';
Template.userAvatar.helpers({
userData() {
@@ -218,13 +217,6 @@ BlazeComponent.extendComponent({
},
false,
);
uploader.on('uploaded', (error, fileRef) => {
if (!error) {
self.setAvatar(
`${formatFleURL(fileRef)}?auth=false&brokenIsFine=true`,
);
}
});
uploader.on('error', (error, fileData) => {
self.setError(error.reason);
});
@@ -238,8 +230,9 @@ BlazeComponent.extendComponent({
'click .js-select-initials'() {
this.setAvatar('');
},
'click .js-delete-avatar'() {
'click .js-delete-avatar'(event) {
Avatars.remove(this.currentData()._id);
event.stopPropagation();
},
},
];
+1 -1
View File
@@ -255,7 +255,7 @@ Utils = {
isMiniScreen() {
// OLD WINDOW WIDTH DETECTION:
this.windowResizeDep.depend();
return $(window).width() <= 800;
return $(window).width() <= 250;
},
isTouchScreen() {
+5
View File
@@ -271,6 +271,11 @@ services:
#-ATTACHMENTS_UPLOAD_MIME_TYPES=image/*,text/*
#-ATTACHMENTS_UPLOAD_MAX_SIZE=5000000
#---------------------------------------------------------------
# ==== Allow configuration to validate uploaded avatars ====
#-AVATARS_UPLOAD_EXTERNAL_PROGRAM=/usr/local/bin/avscan {file}
#-AVATARS_UPLOAD_MIME_TYPES=image/*
#-AVATARS_UPLOAD_MAX_SIZE=500000
#---------------------------------------------------------------
# ==== Allow to shrink attached/pasted image ====
# https://github.com/wekan/wekan/pull/2544
#-MAX_IMAGE_PIXEL=1024
+1 -1
View File
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: "6.38"
appVersion: "6.41"
dependencies:
- condition: mongodb.enabled
name: mongodb
+1 -1
View File
@@ -14,7 +14,7 @@ serviceAccounts:
##
image:
repository: quay.io/wekan/wekan
tag: v6.38
tag: v6.41
pullPolicy: IfNotPresent
## Configuration for wekan component
+5 -5
View File
@@ -295,7 +295,7 @@
"linkCardPopup-title": "Karte verknüpfen",
"searchElementPopup-title": "Suche",
"copyCardPopup-title": "Karte kopieren",
"copyManyCardsPopup-title": "Copy Template to Many Cards",
"copyManyCardsPopup-title": "Kopiere die Vorlage zu mehreren Karten",
"copyManyCardsPopup-instructions": "Titel und Beschreibungen der Zielkarten im folgenden JSON-Format",
"copyManyCardsPopup-format": "[ {\"title\": \"Titel der ersten Karte\", \"description\":\"Beschreibung der ersten Karte\"}, {\"title\":\"Titel der zweiten Karte\",\"description\":\"Beschreibung der zweiten Karte\"},{\"title\":\"Titel der letzten Karte\",\"description\":\"Beschreibung der letzten Karte\"} ]",
"create": "Erstellen",
@@ -1180,8 +1180,8 @@
"action": "Aktion",
"board-title": "Board-Titel",
"attachmentRenamePopup-title": "Umbenennen",
"uploading": "Uploading",
"remaining_time": "Remaining time",
"speed": "Speed",
"progress": "Progress"
"uploading": "Hochladen",
"remaining_time": "Verbleibende Zeit",
"speed": "Schnelligkeit",
"progress": "Fortschritt"
}
+5 -5
View File
@@ -295,7 +295,7 @@
"linkCardPopup-title": "Lier une Carte",
"searchElementPopup-title": "Chercher",
"copyCardPopup-title": "Copier la carte",
"copyManyCardsPopup-title": "Copy Template to Many Cards",
"copyManyCardsPopup-title": "Copier le modèle vers plusieurs cartes",
"copyManyCardsPopup-instructions": "Titres et descriptions des cartes de destination dans ce format JSON",
"copyManyCardsPopup-format": "[ {\"title\": \"Titre de la première carte\", \"description\":\"Description de la première carte\"}, {\"title\":\"Titre de la seconde carte\",\"description\":\"Description de la seconde carte\"},{\"title\":\"Titre de la dernière carte\",\"description\":\"Description de la dernière carte\"} ]",
"create": "Créer",
@@ -1180,8 +1180,8 @@
"action": "Action",
"board-title": "Titre du tableau",
"attachmentRenamePopup-title": "Renommer",
"uploading": "Uploading",
"remaining_time": "Remaining time",
"speed": "Speed",
"progress": "Progress"
"uploading": "Chargement",
"remaining_time": "Temps restant",
"speed": "Vitesse",
"progress": "Avancement"
}
+5 -5
View File
@@ -295,7 +295,7 @@
"linkCardPopup-title": "קישור כרטיס",
"searchElementPopup-title": "חיפוש",
"copyCardPopup-title": "העתקת כרטיס",
"copyManyCardsPopup-title": "Copy Template to Many Cards",
"copyManyCardsPopup-title": "העתקת תבנית למגוון כרטיסים",
"copyManyCardsPopup-instructions": "כותרות ותיאורים של כרטיסי יעד בתצורת JSON זו",
"copyManyCardsPopup-format": "[ {\"title\": \"כותרת כרטיס ראשון\", \"description\":\"תיאור כרטיס ראשון\"}, {\"title\":\"כותרת כרטיס שני\",\"description\":\"תיאור כרטיס שני\"},{\"title\":\"כותרת כרטיס אחרון\",\"description\":\"תיאור כרטיס אחרון\"} ]",
"create": "יצירה",
@@ -1180,8 +1180,8 @@
"action": "פעולה",
"board-title": "כותרת לוח",
"attachmentRenamePopup-title": "שינוי שם",
"uploading": "Uploading",
"remaining_time": "Remaining time",
"speed": "Speed",
"progress": "Progress"
"uploading": "העלאה",
"remaining_time": "זמן שנותר",
"speed": "מהירות",
"progress": "התקדמות"
}
+4 -4
View File
@@ -295,7 +295,7 @@
"linkCardPopup-title": "Koppel Kaart",
"searchElementPopup-title": "Zoek",
"copyCardPopup-title": "Kopieer kaart",
"copyManyCardsPopup-title": "Copy Template to Many Cards",
"copyManyCardsPopup-title": "Kopieer Template naar Meerdere Kaarten",
"copyManyCardsPopup-instructions": "Doel kaart titels en omschrijvingen in dit JSON formaat",
"copyManyCardsPopup-format": "[ {\"title\": \"Titel eerste kaart\", \"description\":\"Omschrijving eerste kaart\"}, {\"title\":\"Titel tweede kaart\",\"description\":\"Omschrijving tweede kaart\"},{\"title\":\"Titel laatste kaart\",\"description\":\"Omschrijving laatste kaart\"} ]",
"create": "Aanmaken",
@@ -1181,7 +1181,7 @@
"board-title": "Bord Titel",
"attachmentRenamePopup-title": "Hernoem",
"uploading": "Uploading",
"remaining_time": "Remaining time",
"speed": "Speed",
"progress": "Progress"
"remaining_time": "Resterende tijd",
"speed": "Snelheid",
"progress": "Voortgang"
}
+5 -5
View File
@@ -295,7 +295,7 @@
"linkCardPopup-title": "Ligar Cartão",
"searchElementPopup-title": "Buscar",
"copyCardPopup-title": "Copiar o cartão",
"copyManyCardsPopup-title": "Copy Template to Many Cards",
"copyManyCardsPopup-title": "Copiar Modelo para Vários Cartões",
"copyManyCardsPopup-instructions": "Títulos e descrições do cartão de destino neste formato JSON",
"copyManyCardsPopup-format": "[ {\"title\": \"Título do primeiro cartão\", \"description\":\"Descrição do primeiro cartão\"}, {\"title\":\"Título do segundo cartão\",\"description\":\"Descrição do segundo cartão\"},{\"title\":\"Título do último cartão\",\"description\":\"Descrição do último cartão\"} ]",
"create": "Criar",
@@ -1180,8 +1180,8 @@
"action": "Ação",
"board-title": "Título do Quadro",
"attachmentRenamePopup-title": "Renomear",
"uploading": "Uploading",
"remaining_time": "Remaining time",
"speed": "Speed",
"progress": "Progress"
"uploading": "Carregando",
"remaining_time": "Tempo restante",
"speed": "Velocidade",
"progress": "Progresso"
}
+11 -11
View File
@@ -139,7 +139,7 @@
"board-info-on-my-boards": "面板全局设置",
"boardInfoOnMyBoardsPopup-title": "面板全局设置",
"boardInfoOnMyBoards-title": "面板全局设置",
"show-card-counter-per-list": "Show card count per list",
"show-card-counter-per-list": "显示每个列表的卡数\n",
"show-board_members-avatar": "显示面板成员头像",
"board-nb-stars": "%s 星标",
"board-not-found": "看板不存在",
@@ -295,7 +295,7 @@
"linkCardPopup-title": "链接卡片",
"searchElementPopup-title": "搜索",
"copyCardPopup-title": "复制卡片",
"copyManyCardsPopup-title": "Copy Template to Many Cards",
"copyManyCardsPopup-title": "将模板复制到多张卡片",
"copyManyCardsPopup-instructions": "以JSON格式表示目标卡片的标题和描述",
"copyManyCardsPopup-format": "[ {\"title\": \"第一个卡片的标题\", \"description\":\"第一个卡片的描述\"}, {\"title\":\"第二个卡片的标题\",\"description\":\"第二个卡片的描述\"},{\"title\":\"最后一个卡片的标题\",\"description\":\"最后一个卡片的描述\"} ]",
"create": "创建",
@@ -542,7 +542,7 @@
"rename-board": "重命名看板",
"restore": "还原",
"rescue-card-description": "Show rescue dialogue before closing for unsaved card descriptions",
"rescue-card-description-dialogue": "Overwrite current card description with your changes?",
"rescue-card-description-dialogue": "用您的更改覆盖当前卡片描述?",
"card-settings": "卡片设置",
"save": "保存",
"search": "搜索",
@@ -1173,15 +1173,15 @@
"move-all-attachments-to-gridfs": "Move all attachments to GridFS",
"move-all-attachments-of-board-to-fs": "Move all attachments of board to filesystem",
"move-all-attachments-of-board-to-gridfs": "Move all attachments of board to GridFS",
"path": "Path",
"version-name": "Version-Name",
"size": "Size",
"storage": "Storage",
"path": "路径",
"version-name": "版本名称",
"size": "大小",
"storage": "存储",
"action": "操作",
"board-title": "Board Title",
"board-title": "面板标题",
"attachmentRenamePopup-title": "重命名",
"uploading": "Uploading",
"remaining_time": "Remaining time",
"uploading": "上传中",
"remaining_time": "剩余时间",
"speed": "Speed",
"progress": "Progress"
"progress": "进度"
}
+13 -39
View File
@@ -1,15 +1,12 @@
import { Meteor } from 'meteor/meteor';
import { FilesCollection } from 'meteor/ostrio:files';
import { exec } from 'node:child_process';
import { promisify } from 'node:util';
import { isFileValid } from './fileValidation';
import { createBucket } from './lib/grid/createBucket';
import fs from 'fs';
import FileType from 'file-type';
import path from 'path';
import { AttachmentStoreStrategyFilesystem, AttachmentStoreStrategyGridFs} from '/models/lib/attachmentStoreStrategy';
import FileStoreStrategyFactory, {moveToStorage, rename, STORAGE_NAME_FILESYSTEM, STORAGE_NAME_GRIDFS} from '/models/lib/fileStoreStrategy';
let asyncExec;
let attachmentUploadExternalProgram;
let attachmentUploadMimeTypes = [];
let attachmentUploadSize = 0;
@@ -17,7 +14,6 @@ let attachmentBucket;
let storagePath;
if (Meteor.isServer) {
asyncExec = promisify(exec);
attachmentBucket = createBucket('attachments');
if (process.env.ATTACHMENTS_UPLOAD_MIME_TYPES) {
@@ -63,7 +59,12 @@ Attachments = new FilesCollection({
delete opts.meta.fileId;
} else if (opts?.file?.name) {
// Server
filenameWithoutExtension = opts.file.name.replace(new RegExp(opts.file.extensionWithDot + "$"), "")
if (opts.file.extension) {
filenameWithoutExtension = opts.file.name.replace(new RegExp(opts.file.extensionWithDot + "$"), "")
} else {
// file has no extension, so don't replace anything, otherwise the last character is removed (because extensionWithDot = '.')
filenameWithoutExtension = opts.file.name;
}
fileId = opts.fileId;
}
else {
@@ -75,6 +76,10 @@ Attachments = new FilesCollection({
// remove fileId from meta, it was only stored there to have this information here in the namingFunction function
return ret;
},
sanitize(str, max, replacement) {
// keep the original filename
return str;
},
storagePath() {
const ret = fileStoreStrategyFactory.storagePath;
return ret;
@@ -140,9 +145,6 @@ if (Meteor.isServer) {
const fileObj = Attachments.findOne({_id: fileObjId});
moveToStorage(fileObj, storageDestination, fileStoreStrategyFactory);
// since Meteor-Files 2.1.0 the filename is truncated to 28 characters, so rename the file after upload to the right filename back
rename(fileObj, fileObj.name, fileStoreStrategyFactory);
},
renameAttachment(fileObjId, newName) {
check(fileObjId, String);
@@ -155,34 +157,7 @@ if (Meteor.isServer) {
check(fileObjId, String);
const fileObj = Attachments.findOne({_id: fileObjId});
let isValid = true;
if (attachmentUploadMimeTypes.length) {
const mimeTypeResult = Promise.await(FileType.fromFile(fileObj.path));
const mimeType = (mimeTypeResult ? mimeTypeResult.mime : fileObj.type);
const baseMimeType = mimeType.split('/', 1)[0];
isValid = attachmentUploadMimeTypes.includes(mimeType) || attachmentUploadMimeTypes.includes(baseMimeType + '/*') || attachmentUploadMimeTypes.includes('*');
if (!isValid) {
console.log("Validation of uploaded file failed: file " + fileObj.path + " - mimetype " + mimeType);
}
}
if (attachmentUploadSize && fileObj.size > attachmentUploadSize) {
console.log("Validation of uploaded file failed: file " + fileObj.path + " - size " + fileObj.size);
isValid = false;
}
if (isValid && attachmentUploadExternalProgram) {
Promise.await(asyncExec(attachmentUploadExternalProgram.replace("{file}", '"' + fileObj.path + '"')));
isValid = fs.existsSync(fileObj.path);
if (!isValid) {
console.log("Validation of uploaded file failed: file " + fileObj.path + " has been deleted externally");
}
}
const isValid = Promise.await(isFileValid(fileObj, attachmentUploadMimeTypes, attachmentUploadSize, attachmentUploadExternalProgram));
if (!isValid) {
Attachments.remove(fileObjId);
@@ -192,12 +167,11 @@ if (Meteor.isServer) {
check(fileObjId, String);
check(storageDestination, String);
Meteor.defer(() => Meteor.call('validateAttachment', fileObjId));
Meteor.call('validateAttachment', fileObjId);
const fileObj = Attachments.findOne({_id: fileObjId});
if (fileObj) {
console.debug("Validation of uploaded file completed: file " + fileObj.path + " - storage destination " + storageDestination);
Meteor.defer(() => Meteor.call('moveAttachmentToStorage', fileObjId, storageDestination));
}
},
+80 -4
View File
@@ -1,13 +1,40 @@
import { Meteor } from 'meteor/meteor';
import { FilesCollection } from 'meteor/ostrio:files';
import { formatFleURL } from 'meteor/ostrio:files/lib';
import { isFileValid } from './fileValidation';
import { createBucket } from './lib/grid/createBucket';
import fs from 'fs';
import path from 'path';
import FileStoreStrategyFactory, { FileStoreStrategyFilesystem, FileStoreStrategyGridFs} from '/models/lib/fileStoreStrategy';
import FileStoreStrategyFactory, { FileStoreStrategyFilesystem, FileStoreStrategyGridFs, STORAGE_NAME_FILESYSTEM } from '/models/lib/fileStoreStrategy';
let avatarsUploadExternalProgram;
let avatarsUploadMimeTypes = [];
let avatarsUploadSize = 72000;
let avatarsBucket;
let storagePath;
if (Meteor.isServer) {
if (process.env.AVATARS_UPLOAD_MIME_TYPES) {
avatarsUploadMimeTypes = process.env.AVATARS_UPLOAD_MIME_TYPES.split(',');
avatarsUploadMimeTypes = avatarsUploadMimeTypes.map(value => value.trim());
}
if (process.env.AVATARS_UPLOAD_MAX_SIZE) {
avatarsUploadSize = parseInt(process.env.AVATARS_UPLOAD_MAX_SIZE);
if (isNaN(avatarsUploadSize)) {
avatarsUploadSize = 0
}
}
if (process.env.AVATARS_UPLOAD_EXTERNAL_PROGRAM) {
avatarsUploadExternalProgram = process.env.AVATARS_UPLOAD_EXTERNAL_PROGRAM;
if (!avatarsUploadExternalProgram.includes("{file}")) {
avatarsUploadExternalProgram = undefined;
}
}
avatarsBucket = createBucket('avatars');
storagePath = path.join(process.env.WRITABLE_PATH, 'avatars');
}
@@ -18,12 +45,43 @@ Avatars = new FilesCollection({
debug: false, // Change to `true` for debugging
collectionName: 'avatars',
allowClientCode: true,
namingFunction(opts) {
let filenameWithoutExtension = ""
let fileId = "";
if (opts?.name) {
// Client
filenameWithoutExtension = opts.name.replace(/(.+)\..+/, "$1");
fileId = opts.meta.fileId;
delete opts.meta.fileId;
} else if (opts?.file?.name) {
// Server
if (opts.file.extension) {
filenameWithoutExtension = opts.file.name.replace(new RegExp(opts.file.extensionWithDot + "$"), "")
} else {
// file has no extension, so don't replace anything, otherwise the last character is removed (because extensionWithDot = '.')
filenameWithoutExtension = opts.file.name;
}
fileId = opts.fileId;
}
else {
// should never reach here
filenameWithoutExtension = Math.random().toString(36).slice(2);
fileId = Math.random().toString(36).slice(2);
}
const ret = fileId + "-original-" + filenameWithoutExtension;
// remove fileId from meta, it was only stored there to have this information here in the namingFunction function
return ret;
},
sanitize(str, max, replacement) {
// keep the original filename
return str;
},
storagePath() {
const ret = fileStoreStrategyFactory.storagePath;
return ret;
},
onBeforeUpload(file) {
if (file.size <= 72000 && file.type.startsWith('image/')) {
if (file.size <= avatarsUploadSize && file.type.startsWith('image/')) {
return true;
}
return 'avatar-too-big';
@@ -31,14 +89,32 @@ Avatars = new FilesCollection({
onAfterUpload(fileObj) {
// current storage is the filesystem, update object and database
Object.keys(fileObj.versions).forEach(versionName => {
fileObj.versions[versionName].storage = "fs";
fileObj.versions[versionName].storage = STORAGE_NAME_FILESYSTEM;
});
Avatars.update({ _id: fileObj._id }, { $set: { "versions" : fileObj.versions } });
Avatars.update({ _id: fileObj._id }, { $set: { "versions": fileObj.versions } });
const isValid = Promise.await(isFileValid(fileObj, avatarsUploadMimeTypes, avatarsUploadSize, avatarsUploadExternalProgram));
if (isValid) {
Users.findOne(fileObj.userId).setAvatarUrl(`${formatFleURL(fileObj)}?auth=false&brokenIsFine=true`);
} else {
Avatars.remove(fileObj._id);
}
},
interceptDownload(http, fileObj, versionName) {
const ret = fileStoreStrategyFactory.getFileStrategy(fileObj, versionName).interceptDownload(http, this.cacheControl);
return ret;
},
onBeforeRemove(files) {
files.forEach(fileObj => {
if (fileObj.userId) {
Users.findOne(fileObj.userId).setAvatarUrl('');
}
});
return true;
},
onAfterRemove(files) {
files.forEach(fileObj => {
Object.keys(fileObj.versions).forEach(versionName => {
+48
View File
@@ -0,0 +1,48 @@
import { Meteor } from 'meteor/meteor';
import { exec } from 'node:child_process';
import { promisify } from 'node:util';
import fs from 'fs';
import FileType from 'file-type';
let asyncExec;
if (Meteor.isServer) {
asyncExec = promisify(exec);
}
export async function isFileValid(fileObj, mimeTypesAllowed, sizeAllowed, externalCommandLine) {
let isValid = true;
if (mimeTypesAllowed.length) {
const mimeTypeResult = await FileType.fromFile(fileObj.path);
const mimeType = (mimeTypeResult ? mimeTypeResult.mime : fileObj.type);
const baseMimeType = mimeType.split('/', 1)[0];
isValid = mimeTypesAllowed.includes(mimeType) || mimeTypesAllowed.includes(baseMimeType + '/*') || mimeTypesAllowed.includes('*');
if (!isValid) {
console.log("Validation of uploaded file failed: file " + fileObj.path + " - mimetype " + mimeType);
}
}
if (isValid && sizeAllowed && fileObj.size > sizeAllowed) {
console.log("Validation of uploaded file failed: file " + fileObj.path + " - size " + fileObj.size);
isValid = false;
}
if (isValid && externalCommandLine) {
await asyncExec(externalCommandLine.replace("{file}", '"' + fileObj.path + '"'));
isValid = fs.existsSync(fileObj.path);
if (!isValid) {
console.log("Validation of uploaded file failed: file " + fileObj.path + " has been deleted externally");
}
}
if (isValid) {
console.debug("Validation of uploaded file successful: file " + fileObj.path);
}
return isValid;
}
+2 -3
View File
@@ -537,10 +537,9 @@ Users.allow({
// Search a user in the complete server database by its name, username or emails adress. This
// is used for instance to add a new user to a board.
const searchInFields = ['username', 'profile.fullname', 'emails.address'];
Users.search_index = new Index({
UserSearchIndex = new Index({
collection: Users,
fields: searchInFields,
fields: ['username', 'profile.fullname', 'emails.address'],
engine: new MongoDBEngine(),
});
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "wekan",
"version": "v6.38.0",
"version": "v6.41.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "wekan",
"version": "v6.38.0",
"version": "v6.41.0",
"description": "Open-Source kanban",
"private": true,
"repository": {
+3 -3
View File
@@ -7,7 +7,7 @@
<meta charset="utf-8">
<meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<title>Wekan REST API v6.38</title>
<title>Wekan REST API v6.41</title>
<style>
</style>
@@ -1558,7 +1558,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
<ul class="toc-list-h1">
<li>
<a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v6.38">Wekan REST API v6.38</a>
<a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v6.41">Wekan REST API v6.41</a>
</li>
@@ -2156,7 +2156,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
<div class="page-wrapper">
<div class="dark-box"></div>
<div class="content">
<h1 id="wekan-rest-api">Wekan REST API v6.38</h1>
<h1 id="wekan-rest-api">Wekan REST API v6.41</h1>
<blockquote>
<p>Scroll down for code samples, example requests and responses. Select a language for code samples from the tabs above or the mobile navigation menu.</p>
</blockquote>
+1 -1
View File
@@ -1,7 +1,7 @@
swagger: '2.0'
info:
title: Wekan REST API
version: v6.38
version: v6.41
description: |
The REST API allows you to control and extend Wekan with ease.
+5
View File
@@ -53,6 +53,11 @@
#export ATTACHMENTS_UPLOAD_MIME_TYPES="image/*,text/*"
#export ATTACHMENTS_UPLOAD_MAX_SIZE=5000000
#---------------------------------------------------------------
# ==== Allow configuration to validate uploaded avatars ====
#export AVATARS_UPLOAD_EXTERNAL_PROGRAM="/usr/local/bin/avscan {file}"
#export AVATARS_UPLOAD_MIME_TYPES="image/*"
#export AVATARS_UPLOAD_MAX_SIZE=500000
#---------------------------------------------------------------
# ==== RICH TEXT EDITOR IN CARD COMMENTS ====
# https://github.com/wekan/wekan/pull/2560
export RICHER_CARD_COMMENT_EDITOR=false
+2 -2
View File
@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
appTitle = (defaultText = "Wekan"),
# The name of the app as it is displayed to the user.
appVersion = 638,
appVersion = 641,
# Increment this for every release.
appMarketingVersion = (defaultText = "6.38.0~2022-08-18"),
appMarketingVersion = (defaultText = "6.41.0~2022-08-28"),
# Human-readable presentation of the app version.
minUpgradableAppVersion = 0,
+13 -1
View File
@@ -3,7 +3,7 @@
# All supported keys are defined here together with descriptions and default values
# list of supported keys
keys="DEBUG MONGO_LOG_DESTINATION MONGO_URL MONGODB_BIND_UNIX_SOCKET MONGO_URL MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM MAIL_SERVICE MAIL_SERVICE_USER MAIL_SERVICE_PASSWORD ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT WITH_API RICHER_CARD_COMMENT_EDITOR CARD_OPENED_WEBHOOK_ENABLED ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW ACCOUNTS_COMMON_LOGIN_EXPIRATION_IN_DAYS ATTACHMENTS_UPLOAD_EXTERNAL_PROGRAM ATTACHMENTS_UPLOAD_MIME_TYPES ATTACHMENTS_UPLOAD_MAX_SIZE MAX_IMAGE_PIXEL IMAGE_COMPRESS_RATIO BIGEVENTS_PATTERN NOTIFICATION_TRAY_AFTER_READ_DAYS_BEFORE_REMOVE NOTIFY_DUE_DAYS_BEFORE_AND_AFTER NOTIFY_DUE_AT_HOUR_OF_DAY EMAIL_NOTIFICATION_TIMEOUT CORS CORS_ALLOW_HEADERS CORS_EXPOSE_HEADERS MATOMO_ADDRESS MATOMO_SITE_ID MATOMO_DO_NOT_TRACK MATOMO_WITH_USERNAME BROWSER_POLICY_ENABLED TRUSTED_URL WEBHOOKS_ATTRIBUTES OAUTH2_ENABLED OIDC_REDIRECTION_ENABLED OAUTH2_CA_CERT OAUTH2_LOGIN_STYLE OAUTH2_CLIENT_ID OAUTH2_SECRET OAUTH2_SERVER_URL OAUTH2_AUTH_ENDPOINT OAUTH2_USERINFO_ENDPOINT OAUTH2_TOKEN_ENDPOINT OAUTH2_ID_MAP OAUTH2_USERNAME_MAP OAUTH2_FULLNAME_MAP OAUTH2_ID_TOKEN_WHITELIST_FIELDS OAUTH2_EMAIL_MAP OAUTH2_REQUEST_PERMISSIONS OAUTH2_ADFS_ENABLED LDAP_ENABLE LDAP_PORT LDAP_HOST LDAP_AD_SIMPLE_AUTH LDAP_BASEDN LDAP_LOGIN_FALLBACK LDAP_RECONNECT LDAP_TIMEOUT LDAP_IDLE_TIMEOUT LDAP_CONNECT_TIMEOUT LDAP_AUTHENTIFICATION LDAP_AUTHENTIFICATION_USERDN LDAP_AUTHENTIFICATION_PASSWORD LDAP_LOG_ENABLED LDAP_BACKGROUND_SYNC LDAP_BACKGROUND_SYNC_INTERVAL LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS LDAP_ENCRYPTION LDAP_CA_CERT LDAP_REJECT_UNAUTHORIZED LDAP_USER_AUTHENTICATION LDAP_USER_AUTHENTICATION_FIELD LDAP_USER_SEARCH_FILTER LDAP_USER_SEARCH_SCOPE LDAP_USER_SEARCH_FIELD LDAP_SEARCH_PAGE_SIZE LDAP_SEARCH_SIZE_LIMIT LDAP_GROUP_FILTER_ENABLE LDAP_GROUP_FILTER_OBJECTCLASS LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT LDAP_GROUP_FILTER_GROUP_NAME LDAP_UNIQUE_IDENTIFIER_FIELD LDAP_UTF8_NAMES_SLUGIFY LDAP_USERNAME_FIELD LDAP_FULLNAME_FIELD LDAP_MERGE_EXISTING_USERS LDAP_SYNC_USER_DATA LDAP_SYNC_USER_DATA_FIELDMAP LDAP_SYNC_GROUP_ROLES LDAP_DEFAULT_DOMAIN LDAP_EMAIL_MATCH_ENABLE LDAP_EMAIL_MATCH_REQUIRE LDAP_EMAIL_MATCH_VERIFIED LDAP_EMAIL_FIELD LDAP_SYNC_ADMIN_STATUS LDAP_SYNC_ADMIN_GROUPS HEADER_LOGIN_ID HEADER_LOGIN_FIRSTNAME HEADER_LOGIN_LASTNAME HEADER_LOGIN_EMAIL LOGOUT_WITH_TIMER LOGOUT_IN LOGOUT_ON_HOURS LOGOUT_ON_MINUTES DEFAULT_AUTHENTICATION_METHOD PASSWORD_LOGIN_ENABLED CAS_ENABLED CAS_BASE_URL CAS_LOGIN_URL CAS_VALIDATE_URL SAML_ENABLED SAML_PROVIDER SAML_ENTRYPOINT SAML_ISSUER SAML_CERT SAML_IDPSLO_REDIRECTURL SAML_PRIVATE_KEYFILE SAML_PUBLIC_CERTFILE SAML_IDENTIFIER_FORMAT SAML_LOCAL_PROFILE_MATCH_ATTRIBUTE SAML_ATTRIBUTES ORACLE_OIM_ENABLED RESULTS_PER_PAGE WAIT_SPINNER NODE_OPTIONS"
keys="DEBUG MONGO_LOG_DESTINATION MONGO_URL MONGODB_BIND_UNIX_SOCKET MONGO_URL MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM MAIL_SERVICE MAIL_SERVICE_USER MAIL_SERVICE_PASSWORD ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT WITH_API RICHER_CARD_COMMENT_EDITOR CARD_OPENED_WEBHOOK_ENABLED ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW ACCOUNTS_COMMON_LOGIN_EXPIRATION_IN_DAYS ATTACHMENTS_UPLOAD_EXTERNAL_PROGRAM ATTACHMENTS_UPLOAD_MIME_TYPES ATTACHMENTS_UPLOAD_MAX_SIZE AVATARS_UPLOAD_EXTERNAL_PROGRAM AVATARS_UPLOAD_MIME_TYPES AVATARS_UPLOAD_MAX_SIZE MAX_IMAGE_PIXEL IMAGE_COMPRESS_RATIO BIGEVENTS_PATTERN NOTIFICATION_TRAY_AFTER_READ_DAYS_BEFORE_REMOVE NOTIFY_DUE_DAYS_BEFORE_AND_AFTER NOTIFY_DUE_AT_HOUR_OF_DAY EMAIL_NOTIFICATION_TIMEOUT CORS CORS_ALLOW_HEADERS CORS_EXPOSE_HEADERS MATOMO_ADDRESS MATOMO_SITE_ID MATOMO_DO_NOT_TRACK MATOMO_WITH_USERNAME BROWSER_POLICY_ENABLED TRUSTED_URL WEBHOOKS_ATTRIBUTES OAUTH2_ENABLED OIDC_REDIRECTION_ENABLED OAUTH2_CA_CERT OAUTH2_LOGIN_STYLE OAUTH2_CLIENT_ID OAUTH2_SECRET OAUTH2_SERVER_URL OAUTH2_AUTH_ENDPOINT OAUTH2_USERINFO_ENDPOINT OAUTH2_TOKEN_ENDPOINT OAUTH2_ID_MAP OAUTH2_USERNAME_MAP OAUTH2_FULLNAME_MAP OAUTH2_ID_TOKEN_WHITELIST_FIELDS OAUTH2_EMAIL_MAP OAUTH2_REQUEST_PERMISSIONS OAUTH2_ADFS_ENABLED LDAP_ENABLE LDAP_PORT LDAP_HOST LDAP_AD_SIMPLE_AUTH LDAP_BASEDN LDAP_LOGIN_FALLBACK LDAP_RECONNECT LDAP_TIMEOUT LDAP_IDLE_TIMEOUT LDAP_CONNECT_TIMEOUT LDAP_AUTHENTIFICATION LDAP_AUTHENTIFICATION_USERDN LDAP_AUTHENTIFICATION_PASSWORD LDAP_LOG_ENABLED LDAP_BACKGROUND_SYNC LDAP_BACKGROUND_SYNC_INTERVAL LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS LDAP_ENCRYPTION LDAP_CA_CERT LDAP_REJECT_UNAUTHORIZED LDAP_USER_AUTHENTICATION LDAP_USER_AUTHENTICATION_FIELD LDAP_USER_SEARCH_FILTER LDAP_USER_SEARCH_SCOPE LDAP_USER_SEARCH_FIELD LDAP_SEARCH_PAGE_SIZE LDAP_SEARCH_SIZE_LIMIT LDAP_GROUP_FILTER_ENABLE LDAP_GROUP_FILTER_OBJECTCLASS LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT LDAP_GROUP_FILTER_GROUP_NAME LDAP_UNIQUE_IDENTIFIER_FIELD LDAP_UTF8_NAMES_SLUGIFY LDAP_USERNAME_FIELD LDAP_FULLNAME_FIELD LDAP_MERGE_EXISTING_USERS LDAP_SYNC_USER_DATA LDAP_SYNC_USER_DATA_FIELDMAP LDAP_SYNC_GROUP_ROLES LDAP_DEFAULT_DOMAIN LDAP_EMAIL_MATCH_ENABLE LDAP_EMAIL_MATCH_REQUIRE LDAP_EMAIL_MATCH_VERIFIED LDAP_EMAIL_FIELD LDAP_SYNC_ADMIN_STATUS LDAP_SYNC_ADMIN_GROUPS HEADER_LOGIN_ID HEADER_LOGIN_FIRSTNAME HEADER_LOGIN_LASTNAME HEADER_LOGIN_EMAIL LOGOUT_WITH_TIMER LOGOUT_IN LOGOUT_ON_HOURS LOGOUT_ON_MINUTES DEFAULT_AUTHENTICATION_METHOD PASSWORD_LOGIN_ENABLED CAS_ENABLED CAS_BASE_URL CAS_LOGIN_URL CAS_VALIDATE_URL SAML_ENABLED SAML_PROVIDER SAML_ENTRYPOINT SAML_ISSUER SAML_CERT SAML_IDPSLO_REDIRECTURL SAML_PRIVATE_KEYFILE SAML_PUBLIC_CERTFILE SAML_IDENTIFIER_FORMAT SAML_LOCAL_PROFILE_MATCH_ATTRIBUTE SAML_ATTRIBUTES ORACLE_OIM_ENABLED RESULTS_PER_PAGE WAIT_SPINNER NODE_OPTIONS"
#DESCRIPTION_WRITABLE_PATH="Writable path. Default: $SNAP_COMMON/files"
#DEFAULT_WRITABLE_PATH="$SNAP_COMMON/files"
@@ -141,6 +141,18 @@ DESCRIPTION_ATTACHMENTS_UPLOAD_MAX_SIZE="Attachments upload max size in bytes. E
DEFAULT_ATTACHMENTS_UPLOAD_MAX_SIZE=""
KEY_ATTACHMENTS_UPLOAD_MAX_SIZE="attachments-upload-max-size"
DESCRIPTION_AVATARS_UPLOAD_EXTERNAL_PROGRAM="Avatars upload validation by an external program. {file} is replaced by the uploaded file. Example: /usr/local/bin/avscan {file}"
DEFAULT_AVATARS_UPLOAD_EXTERNAL_PROGRAM=""
KEY_AVATARS_UPLOAD_EXTERNAL_PROGRAM="avatars-upload-external-program"
DESCRIPTION_AVATARS_UPLOAD_MIME_TYPES="Avatars upload mime types. Example: image/*"
DEFAULT_AVATARS_UPLOAD_MIME_TYPES=""
KEY_AVATARS_UPLOAD_MIME_TYPES="avatars-upload-mime-types"
DESCRIPTION_AVATARS_UPLOAD_MAX_SIZE="Avatars upload max size in bytes. Example: 500000"
DEFAULT_AVATARS_UPLOAD_MAX_SIZE=""
KEY_AVATARS_UPLOAD_MAX_SIZE="avatars-upload-max-size"
# Example, not in use: /var/snap/wekan/common/uploads/
DESCRIPTION_MAX_IMAGE_PIXEL="Max image pixel: Allow to shrink attached/pasted image https://github.com/wekan/wekan/pull/2544"
+6 -6
View File
@@ -1,5 +1,5 @@
name: wekan
version: '6.38'
version: '6.41'
base: core20
summary: Open Source kanban
description: |
@@ -65,7 +65,7 @@ apps:
parts:
mongodb:
source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2004-5.0.10.tgz
source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2004-5.0.11.tgz
plugin: dump
stage-packages:
- libssl1.1
@@ -91,7 +91,7 @@ parts:
- $mongo
mongodb44:
source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2004-4.4.15.tgz
source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2004-4.4.16.tgz
plugin: dump
organize:
bin: mongo44bin
@@ -160,9 +160,9 @@ parts:
# Cleanup
mkdir .build
cd .build
wget https://github.com/wekan/wekan/releases/download/v6.38/wekan-6.38-amd64.zip
unzip wekan-6.38-amd64.zip
rm wekan-6.38-amd64.zip
wget https://github.com/wekan/wekan/releases/download/v6.41/wekan-6.41-amd64.zip
unzip wekan-6.41-amd64.zip
rm wekan-6.41-amd64.zip
cd ..
##cd .build/bundle
##find . -type d -name '*-garbage*' | xargs rm -rf
+6
View File
@@ -55,9 +55,15 @@ REM # ==== ACCOUNT OPTIONS ====
REM SET ACCOUNTS_COMMON_LOGIN_EXPIRATION_IN_DAYS=90
REM # ==== Allow configuration to validate uploaded attachments ====
REM SET ATTACHMENTS_UPLOAD_EXTERNAL_PROGRAM="avscan {file}"
REM SET ATTACHMENTS_UPLOAD_MIME_TYPES="image/*,text/*"
REM SET ATTACHMENTS_UPLOAD_MAX_SIZE=5000000
REM # ==== Allow configuration to validate uploaded avatars ====
REM SET AVATARS_UPLOAD_EXTERNAL_PROGRAM="avscan {file}"
REM SET AVATARS_UPLOAD_MIME_TYPES="image/*"
REM SET AVATARS_UPLOAD_MAX_SIZE=500000
REM # ==== NOTIFICATION TRAY AFTER READ DAYS BEFORE REMOVE =====
REM # Number of days after a notification is read before we remove it.
REM # Default: 2
+5
View File
@@ -58,6 +58,11 @@
#export ATTACHMENTS_UPLOAD_MIME_TYPES="image/*,text/*"
#export ATTACHMENTS_UPLOAD_MAX_SIZE=5000000
#---------------------------------------------------------------
# ==== Allow configuration to validate uploaded avatars ====
#export AVATARS_UPLOAD_EXTERNAL_PROGRAM="/usr/local/bin/avscan {file}"
#export AVATARS_UPLOAD_MIME_TYPES="image/*"
#export AVATARS_UPLOAD_MAX_SIZE=500000
#---------------------------------------------------------------
# ==== RICH TEXT EDITOR IN CARD COMMENTS ====
# https://github.com/wekan/wekan/pull/2560
export RICHER_CARD_COMMENT_EDITOR=false
+5
View File
@@ -281,6 +281,11 @@ services:
#-ATTACHMENTS_UPLOAD_MIME_TYPES=image/*,text/*
#-ATTACHMENTS_UPLOAD_MAX_SIZE=5000000
#---------------------------------------------------------------
# ==== Allow configuration to validate uploaded avatars ====
#-AVATARS_UPLOAD_EXTERNAL_PROGRAM=/usr/local/bin/avscan {file}
#-AVATARS_UPLOAD_MIME_TYPES=image/*
#-AVATARS_UPLOAD_MAX_SIZE=500000
#---------------------------------------------------------------
# ==== Allow to shrink attached/pasted image ====
# https://github.com/wekan/wekan/pull/2544
#-MAX_IMAGE_PIXEL=1024