Merge pull request #6457 in DESIGN/design from release/11.0 to feature/x

* commit '1878786cf32551c2fae289aa3019e9002007f309':
  REPORT-61846 数据连接越权漏洞修复

designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@@ -12,6 +12,7 @@ import com.fr.base.theme.ThemedTemplate;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.base.theme.TemplateTheme;
 import com.fr.base.theme.TemplateThemeConfig;
+import com.fr.decision.config.FSConfig;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.DesignState;
 import com.fr.design.DesignerEnvManager;
@@ -1488,16 +1489,16 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
      * 设置新引擎后，有不支持的功能时，设计器中模板的标题需要加上“兼容模式”或者“不支持分页引擎”来提示用户
      * */
     private String compatibilityTip() {
-        if (!CptAndCptxCompatibilityUtil.isEngineXEnable(this.getTarget(), getEditingFILE().getPath())){
+        if (!CptAndCptxCompatibilityUtil.isEngineXEnable(this.getTarget(), getEditingFILE().getPath())) {
             return StringUtils.EMPTY;
         }
         String path = this.getEditingFILE().getPath();
         CptxMetadata metadata = CptxFileUtils.getMetadata(path);
         //是否是兼容模式，兼容模式下，设置了新引擎的cpt和cptx的后缀不同
         if (metadata != null && metadata.isForceCpt()) {
-            if (path.endsWith(".cptx")){
+            if (path.endsWith(".cptx")) {
                 return InterProviderFactory.getProvider().getLocText("Fine-Plugin_Engine_Compatibility_Mode");
-            } else if (path.endsWith(".cpt")){
+            } else if (path.endsWith(".cpt")) {
                 return InterProviderFactory.getProvider().getLocText("Fine-Plugin_Engine_Paging_Engine_Not_Work");
             }
         }
@@ -1594,8 +1595,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     }
 
     private boolean saveRealFile() throws Exception {
-        JTemplateAuthorityChecker jTemplateAuthorityChecker = new JTemplateAuthorityChecker(this);
+        if (checkJTemplateAuthority()) {
-        if (jTemplateAuthorityChecker.isAuthority()) {
             FILE editingFILE = this.getEditingFILE();
             if (editingFILE == null || editingFILE instanceof MemFILE) {
                 return false;
@@ -1603,6 +1603,18 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             export();
             this.editingFILE = editingFILE;
             return true;
+        } else {
+            return false;
+        }
+    }
+
+    private boolean checkJTemplateAuthority() {
+        if (!FSConfig.getInstance().getAuthorizeAttr().isDataConnectionAuthority()) {
+            return true;
+        }
+        JTemplateAuthorityChecker jTemplateAuthorityChecker = new JTemplateAuthorityChecker(this);
+        if (jTemplateAuthorityChecker.isAuthority()) {
+            return true;
         } else {
             jTemplateAuthorityChecker.showAuthorityFailPromptDialog();
             return false;
@@ -1643,7 +1655,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             @Override
             public void run() {
                 boolean isChangedFile = !JTemplate.this.saved;
-                if (isChangedFile){
+                if (isChangedFile) {
                     CptCompileUtil.compile(JTemplate.this);
                 }
                 callBackForSave();
@@ -1710,7 +1722,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
              * 2.在这三种情况下：1.cptx文件另存为cpt文件 2.cptx另存为cptx文件 3.设置了新引擎的cpt文件另存为cpt文件，
              *   因为文件的编译目录改变了，需要重新预编译，因此设置jTemplate的保存状态为false
              * */
-            if (CptAndCptxCompatibilityUtil.needRecompile(oldName, this)){
+            if (CptAndCptxCompatibilityUtil.needRecompile(oldName, this)) {
                 this.saved = false;
             }
             result = this.saveRealFile();