Revert "attrWhiteList -> attrWhiteString"

This reverts commit 49c5a04e8dc43255535ae53ba4a56fcd2615f86f.

packages/app/src/client/services/AdminMarkDownContainer.js

@@ -29,7 +29,7 @@ export default class AdminMarkDownContainer extends Container {
       isEnabledXss: false,
       xssOption: '',
       tagWhiteList: '',
-      attrWhiteString: '',
+      attrWhiteList: '',
     };
 
     this.switchEnableXss = this.switchEnableXss.bind(this);
@@ -60,7 +60,7 @@ export default class AdminMarkDownContainer extends Container {
       isEnabledXss: markdownParams.isEnabledXss,
       xssOption: markdownParams.xssOption,
       tagWhiteList: markdownParams.tagWhiteList || '',
-      attrWhiteString: markdownParams.attrWhiteString || '',
+      attrWhiteList: markdownParams.attrWhiteList || '',
     });
   }
 
@@ -120,13 +120,13 @@ export default class AdminMarkDownContainer extends Container {
    */
   async updateXssSetting() {
     let { tagWhiteList } = this.state;
-    const { attrWhiteString } = this.state;
+    const { attrWhiteList } = this.state;
 
     tagWhiteList = Array.isArray(tagWhiteList) ? tagWhiteList : tagWhiteList.split(',');
 
     try {
       // Check if parsing is possible
-      JSON.parse(attrWhiteString);
+      JSON.parse(attrWhiteList);
     }
     catch (err) {
       throw Error(err);
@@ -136,7 +136,7 @@ export default class AdminMarkDownContainer extends Container {
       isEnabledXss: this.state.isEnabledXss,
       xssOption: this.state.xssOption,
       tagWhiteList,
-      attrWhiteString,
+      attrWhiteList,
     });
   }
 

packages/app/src/components/Admin/MarkdownSetting/WhiteListInput.jsx

@@ -14,7 +14,7 @@ class WhiteListInput extends React.Component {
     super(props);
 
     this.tagWhiteList = React.createRef();
-    this.attrWhiteString = React.createRef();
+    this.attrWhiteList = React.createRef();
 
     this.onClickRecommendTagButton = this.onClickRecommendTagButton.bind(this);
     this.onClickRecommendAttrButton = this.onClickRecommendAttrButton.bind(this);
@@ -26,8 +26,8 @@ class WhiteListInput extends React.Component {
   }
 
   onClickRecommendAttrButton() {
-    this.attrWhiteString.current.value = attrs;
-    this.props.adminMarkDownContainer.setState({ attrWhiteString: attrs });
+    this.attrWhiteList.current.value = attrs;
+    this.props.adminMarkDownContainer.setState({ attrWhiteList: attrs });
   }
 
   render() {
@@ -64,9 +64,9 @@ class WhiteListInput extends React.Component {
             name="recommendedAttrs"
             rows="6"
             cols="40"
-            ref={this.attrWhiteString}
-            defaultValue={adminMarkDownContainer.state.attrWhiteString}
-            onChange={(e) => { adminMarkDownContainer.setState({ attrWhiteString: e.target.value }) }}
+            ref={this.attrWhiteList}
+            defaultValue={adminMarkDownContainer.state.attrWhiteList}
+            onChange={(e) => { adminMarkDownContainer.setState({ attrWhiteList: e.target.value }) }}
           />
         </div>
       </>

packages/app/src/server/routes/apiv3/markdown-setting.js

@@ -30,7 +30,7 @@ const validator = {
   xssSetting: [
     body('isEnabledXss').isBoolean(),
     body('tagWhiteList').isArray(),
-    body('attrWhiteString').isString(),
+    body('attrWhiteList').isString(),
   ],
 };
 
@@ -82,8 +82,8 @@ const validator = {
  *            items:
  *              type: string
  *              description: tag whitelist
- *          attrWhiteString:
- *            type: string
+ *          attrWhiteList:
+ *            type: array
  *            description: array of attr whiteList
  *            items:
  *              type: string
@@ -128,7 +128,7 @@ module.exports = (crowi) => {
       isEnabledXss: await crowi.configManager.getConfig('markdown', 'markdown:rehypeSanitize:isEnabledPrevention'),
       xssOption: await crowi.configManager.getConfig('markdown', 'markdown:rehypeSanitize:option'),
       tagWhiteList: await crowi.configManager.getConfig('markdown', 'markdown:xss:tagWhiteList'),
-      attrWhiteString: await crowi.configManager.getConfig('markdown', 'markdown:xss:attrWhiteString'),
+      attrWhiteList: await crowi.configManager.getConfig('markdown', 'markdown:xss:attrWhiteList'),
     };
 
     return res.apiv3({ markdownParams });
@@ -296,7 +296,7 @@ module.exports = (crowi) => {
       'markdown:rehypeSanitize:isEnabledPrevention': req.body.isEnabledXss,
       'markdown:rehypeSanitize:option': req.body.xssOption,
       'markdown:xss:tagWhiteList': req.body.tagWhiteList, // Todo: need to be changed at https://redmine.weseek.co.jp/issues/109763
-      'markdown:xss:attrWhiteString': req.body.attrWhiteString, // Todo: need to be changed at https://redmine.weseek.co.jp/issues/109763
+      'markdown:xss:attrWhiteList': req.body.attrWhiteList, // Todo: need to be changed at https://redmine.weseek.co.jp/issues/109763
     };
 
     try {
@@ -305,7 +305,7 @@ module.exports = (crowi) => {
         isEnabledXss: await crowi.configManager.getConfig('markdown', 'markdown:rehypeSanitize:isEnabledPrevention'),
         xssOption: await crowi.configManager.getConfig('markdown', 'markdown:rehypeSanitize:option'),
         tagWhiteList: await crowi.configManager.getConfig('markdown', 'markdown:xss:tagWhiteList'),
-        attrWhiteString: await crowi.configManager.getConfig('markdown', 'markdown:xss:attrWhiteString'),
+        attrWhiteList: await crowi.configManager.getConfig('markdown', 'markdown:xss:attrWhiteList'),
       };
 
       const parameters = { action: SupportedAction.ACTION_ADMIN_MARKDOWN_XSS_UPDATE };