Merge pull request #4964 from haiwen/share-link-password

update create share/upload link

frontend/src/components/dialog/generate-share-link.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import moment from 'moment';
 import copy from 'copy-to-clipboard';
 import { Button, Form, FormGroup, Label, Input, InputGroup, InputGroupAddon, InputGroupText, Alert, FormText } from 'reactstrap';
-import { isPro, gettext, shareLinkExpireDaysMin, shareLinkExpireDaysMax, shareLinkExpireDaysDefault, shareLinkPasswordMinLength, canSendShareLinkEmail } from '../../utils/constants';
+import { isPro, gettext, shareLinkExpireDaysMin, shareLinkExpireDaysMax, shareLinkExpireDaysDefault, shareLinkForceUsePassword, shareLinkPasswordMinLength, shareLinkPasswordStrengthLevel, canSendShareLinkEmail } from '../../utils/constants';
 import ShareLinkPermissionEditor from '../../components/select-editor/share-link-permission-editor';
 import { seafileAPI } from '../../utils/seafile-api';
 import { Utils } from '../../utils/utils';
@@ -47,7 +47,7 @@ class GenerateShareLink extends React.Component {
     this.state = {
       isOpIconShown: false,
       isValidate: false,
-      isShowPasswordInput: false,
+      isShowPasswordInput: shareLinkForceUsePassword ? true : false,
       isPasswordVisible: false,
       isExpireChecked: !this.isExpireDaysNoLimit,
       setExp: 'by-days',
@@ -232,8 +232,8 @@ class GenerateShareLink extends React.Component {
     seafileAPI.deleteShareLink(sharedLinkInfo.token).then(() => {
       this.setState({
         password: '',
-        passwordnew: '',
-        isShowPasswordInput: false,
+        passwdnew: '',
+        isShowPasswordInput: shareLinkForceUsePassword ? true : false,
         expireDays: this.defaultExpireDays,
         isExpireChecked: !this.isExpireDaysNoLimit,
         errorInfo: '',
@@ -272,6 +272,10 @@ class GenerateShareLink extends React.Component {
         this.setState({errorInfo: 'Passwords don\'t match'});
         return false;
       }
+      if (Utils.getStrengthLevel(password) < shareLinkPasswordStrengthLevel) {
+        this.setState({errorInfo: gettext('Password is too weak, should have at least {shareLinkPasswordStrengthLevel} of the following: num, upper letter, lower letter and other symbols'.replace('{shareLinkPasswordStrengthLevel}', shareLinkPasswordStrengthLevel))});
+        return false;
+      }
     }
 
     if (isExpireChecked) {
@@ -359,8 +363,9 @@ class GenerateShareLink extends React.Component {
       return <Loading />;
     }
 
-    let passwordLengthTip = gettext('(at least {passwordLength} characters)');
-    passwordLengthTip = passwordLengthTip.replace('{passwordLength}', shareLinkPasswordMinLength);
+    let passwordLengthTip = gettext('(at least {passwordLength} characters and has {shareLinkPasswordStrengthLevel} of the following: num, upper letter, lower letter and other symbols)');
+    passwordLengthTip = passwordLengthTip.replace('{passwordLength}', shareLinkPasswordMinLength)
+                                         .replace('{shareLinkPasswordStrengthLevel}', shareLinkPasswordStrengthLevel);
 
     if (this.state.sharedLinkInfo) {
       let sharedLinkInfo = this.state.sharedLinkInfo;
@@ -442,10 +447,17 @@ class GenerateShareLink extends React.Component {
       return (
         <Form className="generate-share-link">
           <FormGroup check>
+            {shareLinkForceUsePassword ? (
+            <Label check>
+              <Input type="checkbox" checked readOnly disabled />
+              <span>{gettext('Add password protection')}</span>
+            </Label>
+            ) : (
             <Label check>
               <Input type="checkbox" onChange={this.onPasswordInputChecked} />
               <span>{gettext('Add password protection')}</span>
             </Label>
+            )}
             {this.state.isShowPasswordInput &&
             <div className="ml-4">
               <FormGroup>

frontend/src/components/dialog/generate-upload-link.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import copy from 'copy-to-clipboard';
 import moment from 'moment';
 import { Button, Form, FormGroup, Label, Input, InputGroup, InputGroupAddon, InputGroupText, Alert, FormText } from 'reactstrap';
-import { gettext, shareLinkPasswordMinLength, canSendShareLinkEmail, uploadLinkExpireDaysMin, uploadLinkExpireDaysMax, uploadLinkExpireDaysDefault } from '../../utils/constants';
+import { gettext, shareLinkForceUsePassword, shareLinkPasswordMinLength, shareLinkPasswordStrengthLevel, canSendShareLinkEmail, uploadLinkExpireDaysMin, uploadLinkExpireDaysMax, uploadLinkExpireDaysDefault } from '../../utils/constants';
 import { seafileAPI } from '../../utils/seafile-api';
 import { Utils } from '../../utils/utils';
 import UploadLink from '../../models/upload-link';
@@ -42,10 +42,10 @@ class GenerateUploadLink extends React.Component {
     this.expirationLimitTip = expirationLimitTip;
 
     this.state = {
-      showPasswordInput: false,
+      showPasswordInput: shareLinkForceUsePassword ? true : false,
       passwordVisible: false,
       password: '',
-      passwdnew: '',
+      passwordnew: '',
       sharedUploadInfo: null,
       isSendLinkShown: false,
       isExpireChecked: !this.isExpireDaysNoLimit,
@@ -80,7 +80,7 @@ class GenerateUploadLink extends React.Component {
     this.setState({
       showPasswordInput: !this.state.showPasswordInput,
       password: '',
-      passwdnew: '',
+      passwordnew: '',
       errorInfo: ''
     });
   }
@@ -155,6 +155,10 @@ class GenerateUploadLink extends React.Component {
         this.setState({errorInfo: gettext('Passwords don\'t match')});
         return false;
       }
+      if (Utils.getStrengthLevel(password) < shareLinkPasswordStrengthLevel) {
+        this.setState({errorInfo: gettext('Password is too weak, should have at least {shareLinkPasswordStrengthLevel} of the following: num, upper letter, lower letter and other symbols'.replace('{shareLinkPasswordStrengthLevel}', shareLinkPasswordStrengthLevel))});
+        return false;
+      }
     }
 
     if (isExpireChecked) {
@@ -233,7 +237,7 @@ class GenerateUploadLink extends React.Component {
     let sharedUploadInfo = this.state.sharedUploadInfo;
     seafileAPI.deleteUploadLink(sharedUploadInfo.token).then(() => {
       this.setState({
-        showPasswordInput: false,
+        showPasswordInput: shareLinkForceUsePassword ? true : false,
         expireDays: this.defaultExpireDays,
         isExpireChecked: !this.isExpireDaysNoLimit,
         password: '',
@@ -256,8 +260,10 @@ class GenerateUploadLink extends React.Component {
 
     const { isSendLinkShown } = this.state;
 
-    let passwordLengthTip = gettext('(at least {passwordLength} characters)');
-    passwordLengthTip = passwordLengthTip.replace('{passwordLength}', shareLinkPasswordMinLength);
+    let passwordLengthTip = gettext('(at least {passwordLength} characters and has {shareLinkPasswordStrengthLevel} of the following: num, upper letter, lower letter and other symbols)');
+    passwordLengthTip = passwordLengthTip.replace('{passwordLength}', shareLinkPasswordMinLength)
+                                         .replace('{shareLinkPasswordStrengthLevel}', shareLinkPasswordStrengthLevel);
+
     if (this.state.sharedUploadInfo) {
       let sharedUploadInfo = this.state.sharedUploadInfo;
       return (
@@ -297,8 +303,17 @@ class GenerateUploadLink extends React.Component {
       <Form className="generate-upload-link">
         <FormGroup check>
           <Label check>
-            <Input type="checkbox" onChange={this.addPassword} />
-            <span>{gettext('Add password protection')}</span>
+            {shareLinkForceUsePassword ? (
+            <Label check>
+              <Input type="checkbox" checked readOnly disabled />
+              <span>{gettext('Add password protection')}</span>
+            </Label>
+            ) : (
+            <Label check>
+              <Input type="checkbox" onChange={this.addPassword} />
+              <span>{gettext('Add password protection')}</span>
+            </Label>
+            )}
           </Label>
           {this.state.showPasswordInput &&
           <div className="ml-4">

frontend/src/pages/sys-admin/web-settings/web-settings.js

@@ -299,12 +299,26 @@ class WebSettings extends Component {
                       value={config_dict['REPO_PASSWORD_MIN_LENGTH']}
                       helpTip={gettext('The least number of characters an encrypted library password should include.')}
                     />
+                    <CheckboxItem
+                      saveSetting={this.saveSetting}
+                      displayName={gettext('share/upload link force password')}
+                      keyText='SHARE_LINK_FORCE_USE_PASSWORD'
+                      value={config_dict['SHARE_LINK_FORCE_USE_PASSWORD']}
+                      helpTip={gettext('Force user use password when generating share/upload link.')}
+                    />
                     <InputItem
                       saveSetting={this.saveSetting}
-                      displayName={gettext('download/upload link password minimum length')}
+                      displayName={gettext('share/upload link password minimum length')}
                       keyText='SHARE_LINK_PASSWORD_MIN_LENGTH'
                       value={config_dict['SHARE_LINK_PASSWORD_MIN_LENGTH']}
-                      helpTip={gettext('The least number of characters a download/upload link password should include.')}
+                      helpTip={gettext('The least number of characters a share/upload link password should include.')}
+                    />
+                    <InputItem
+                      saveSetting={this.saveSetting}
+                      displayName={gettext('share/upload link password strength level')}
+                      keyText='SHARE_LINK_PASSWORD_STRENGTH_LEVEL'
+                      value={config_dict['SHARE_LINK_PASSWORD_STRENGTH_LEVEL']}
+                      helpTip={gettext('The level(1-4) of a share/upload link password\'s strength. For example, \'3\' means password must have at least 3 of the following: num, upper letter, lower letter and other symbols')}
                     />
                     <CheckboxItem
                       saveSetting={this.saveSetting}

frontend/src/utils/constants.js

@@ -45,7 +45,9 @@ export const resumableUploadFileBlockSize = window.app.pageOptions.resumableUplo
 export const storages = window.app.pageOptions.storages; // storage backends
 export const libraryTemplates = window.app.pageOptions.libraryTemplates; // library templates
 export const enableRepoSnapshotLabel = window.app.pageOptions.enableRepoSnapshotLabel;
+export const shareLinkForceUsePassword = window.app.pageOptions.shareLinkForceUsePassword;
 export const shareLinkPasswordMinLength = window.app.pageOptions.shareLinkPasswordMinLength;
+export const shareLinkPasswordStrengthLevel = window.app.pageOptions.shareLinkPasswordStrengthLevel;
 export const shareLinkExpireDaysMin = window.app.pageOptions.shareLinkExpireDaysMin;
 export const shareLinkExpireDaysMax = window.app.pageOptions.shareLinkExpireDaysMax;
 export const sideNavFooterCustomHtml = window.app.pageOptions.sideNavFooterCustomHtml;

frontend/src/utils/utils.js

@@ -1,4 +1,4 @@
-import { mediaUrl, gettext, serviceURL, siteRoot, isPro, enableFileComment, fileAuditEnabled, canGenerateShareLink, canGenerateUploadLink, username, folderPermEnabled } from './constants';
+import { mediaUrl, gettext, serviceURL, siteRoot, isPro, enableFileComment, fileAuditEnabled, canGenerateShareLink, canGenerateUploadLink, shareLinkPasswordMinLength, username, folderPermEnabled } from './constants';
 import { strChineseFirstPY } from './pinyin-by-unicode';
 import TextTranslation from './text-translation';
 import React from 'react';
@@ -1342,6 +1342,44 @@ export const Utils = {
 
   hasNextPage(curPage, perPage, totalCount) {
     return curPage * perPage < totalCount;
-  }
+  },
+
+  getStrengthLevel: function(pwd) {
+    const _this = this;
+    var num = 0;
+
+    if (pwd.length < shareLinkPasswordMinLength) {
+        return 0;
+    } else {
+        for (var i = 0; i < pwd.length; i++) {
+            // return the unicode
+            // bitwise OR
+            num |= _this.getCharMode(pwd.charCodeAt(i));
+        }
+        return _this.calculateBitwise(num);
+    }
+  },
+
+  getCharMode: function(n) {
+    if (n >= 48 && n <= 57) // nums
+        return 1;
+    if (n >= 65 && n <= 90) // uppers
+        return 2;
+    if (n >= 97 && n <= 122) // lowers
+        return 4;
+    else
+        return 8;
+  },
+
+  calculateBitwise: function(num) {
+    var level = 0;
+    for (var i = 0; i < 4; i++){
+        // bitwise AND
+        if (num&1) level++;
+        // Right logical shift
+        num>>>=1;
+    }
+    return level;
+  },
 
 };