gc-1100-security-server-dev

config/env.prod.js

@@ -1,5 +1,5 @@
 module.exports = {
   NODE_ENV: 'production',
   // FORMAT_NODE_LOG: false,
-  ACL_ENABLE: true,
+  ACL_ENABLE: false,
 };

src/server/routes/admin.js

@@ -104,7 +104,7 @@ module.exports = function(crowi, app) {
   actions.security = {};
   actions.security.index = function(req, res) {
     const settingForm = Config.setupCofigFormData('crowi', req.config);
-    const acl_enable = process.env.ACL_ENABLE;
+    const acl_enable = process.env.ACL_ENABLE == 'true' ? true : false;
     return res.render('admin/security', { settingForm, acl_enable });
   };
 
@@ -1031,7 +1031,8 @@ module.exports = function(crowi, app) {
 
   actions.api.securitySetting = function(req, res) {
     const form = req.form.settingForm;
-    if (!process.env.ACL_ENABLE) {
+    const acl_enable = process.env.ACL_ENABLE == 'true' ? true : false;
+    if (!acl_enable) {
       const guestMode = form['security:restrictGuestMode'];
       if ( guestMode == 'Deny' ) {
         // TODO エラーメッセージがクライアント画面から消えない

src/server/views/admin/security.html

@@ -44,15 +44,15 @@
             <label for="settingForm[security:registrationMode]" class="col-xs-3 control-label">{{ t('Basic authentication') }}</label>
             <div class="col-xs-3">
               <label for="">ID{{acl_enable}}</label>
-              <input class="form-control" type="text" name="settingForm[security:basicName]"   value="{{ settingForm['security:basicName']|default('') }}" {% if acl_enable == 'false' %}readonly{% endif%}>
+              <input class="form-control" type="text" name="settingForm[security:basicName]"   value="{{ settingForm['security:basicName']|default('') }}" {% if not acl_enable  %}readonly{% endif%}>
             </div>
             <div class="col-xs-3">
               <label for="">{{ t('Password') }}</label>
-              <input class="form-control" type="text" name="settingForm[security:basicSecret]" value="{{ settingForm['security:basicSecret']|default('') }}" {% if acl_enable  == 'false'  %}readonly{% endif%}>
+              <input class="form-control" type="text" name="settingForm[security:basicSecret]" value="{{ settingForm['security:basicSecret']|default('') }}" {% if not acl_enable  %}readonly{% endif%}>
             </div>
             <div class="col-xs-offset-3 col-xs-9">
               <p class="help-block">
-                {% if acl_enable == 'false' %}
+                {% if not acl_enable %}
                   {{ t("security_setting.basic_acl_disable") }}<br>
                 {% else %}
                   {{ t("security_setting.common_authentication") }}<br>