1.40 release

kalcaddle · May 15, 2023 · 7cc2c3c · 7cc2c3c
1 parent 21a012b
commit 7cc2c3c
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 16 deletions.
diff --git a/app/controller/explorer/auth.class.php b/app/controller/explorer/auth.class.php
@@ -394,6 +394,10 @@ public function checkShare($shareID,$sourceID,$method){
 
 		// 自己协作分享的内容; 权限同自己拥有的权限;
 		if($shareInfo['userID'] == USER_ID){
+			$sourceInfo = $shareInfo['sourceInfo'];
+			if( $sourceInfo['targetType'] == 'user' && $sourceInfo['targetID'] == USER_ID ){
+				return $this->canCheckRole($method);
+			}
 			return $this->checkAuthMethod($shareInfo['sourceInfo']['auth']['authValue'],$method);
 		}
 

diff --git a/app/controller/install/index.class.php b/app/controller/install/index.class.php
@@ -61,6 +61,13 @@ public function check(){
         if( in_array(ACTION, $actions) ){
 			ActionCall(ACTION);exit;
         }
+
+		// 安装路径合法性检测; 不允许[, ;%][*][&=+%#?{}]; 允许(_!@$[]()-./); 需要转义([]@$)   
+        $uri = str_replace(HOST,'',APP_HOST);$matchArr = array();
+        if($uri && !preg_match("/^[a-zA-Z0-9_!@$\[\]\(\)\-\.\/]*$/",$uri,$matchArr)){
+        	show_tips("App path cann't has special chars<br/>(程序路径不支持包含特殊符号,请尽量使用英文字母及数字)<pre>".$uri.'</pre>');
+        }
+
         $this->tpl = CONTROLLER_DIR . 'install/static/';
         $value = array('installPath' => INSTALL_PATH);
         $this->values = array_merge($value, $this->installFast());

diff --git a/app/controller/install/static/package.html b/app/controller/install/static/package.html
@@ -177,6 +177,7 @@
 		"type": "password",
 		"value": "",
 		"attr": {"placeholder": LNG['common.password']},
+		"desc": LNG['explorer.share.timeDesc'],
 		"display": LNG['common.password'],
 	},
 

diff --git a/app/sdks/archiveLib/bin/data.bin b/app/sdks/archiveLib/bin/data.bin
diff --git a/config/version.php b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 define('KOD_VERSION','1.40');
-define('KOD_VERSION_BUILD','02');
+define('KOD_VERSION_BUILD','03');
diff --git a/static/app/dist/api.js b/static/app/dist/api.js
diff --git a/static/app/dist/lib.js b/static/app/dist/lib.js
diff --git a/static/app/dist/main.js b/static/app/dist/main.js
diff --git a/static/app/dist/sdk.js b/static/app/dist/sdk.js
diff --git a/static/app/dist/vendor.js b/static/app/dist/vendor.js
diff --git a/static/style/dist/main.css b/static/style/dist/main.css
diff --git a/static/style/dist/sdk.css b/static/style/dist/sdk.css
diff --git a/static/style/lib/main.css b/static/style/lib/main.css