커맨드 유효성을 2개에서 3개구성으로 변경

j_updateServer.php

@@ -1,21 +1,21 @@
 <?php
+
 namespace sammo;
 
-require(__DIR__.'/vendor/autoload.php');
+require(__DIR__ . '/vendor/autoload.php');
 
-function getVersion($target=null){
-    if($target){
+function getVersion($target = null)
+{
+    if ($target) {
         $command = sprintf('git describe %s --long --tags', escapeshellarg($target));
-    }
-    else{
+    } else {
         $command = 'git describe --long --tags';
     }
     exec($command, $output);
-    if(is_array($output)){
+    if (is_array($output)) {
         $output = join('', $output);
     }
     return trim($output);
-    
 }
 
 $session = Session::requireLogin(null)->setReadOnly();
@@ -32,10 +32,10 @@ $v->rule('required', [
     'server'
 ])->rule('regex', 'target', '/^[0-9a-zA-Z^{}\\/\-_,.@]+$/');
 
-if(!$v->validate()){
+if (!$v->validate()) {
     Json::die([
-        'result'=>false,
-        'reason'=>$v->errorStr()
+        'result' => false,
+        'reason' => $v->errorStr()
     ]);
 }
 
@@ -43,177 +43,174 @@ $target = Util::getReq('target');
 
 $server = basename($request['server']);
 
-$allowFullUpdate = in_array('fullUpdate', $session->acl[$server]??[]);
+$allowFullUpdate = in_array('fullUpdate', $session->acl[$server] ?? []);
 $allowFullUpdate |= $session->userGrade >= 6;
 
-$allowUpdate = in_array('update', $session->acl[$server]??[]);
+$allowUpdate = in_array('update', $session->acl[$server] ?? []);
 $allowUpdate |= $session->userGrade >= 5;
 $allowUpdate |= $allowFullUpdate;
 
 
-if(!$allowUpdate){
+if (!$allowUpdate) {
     Json::die([
-        'result'=>false,
-        'reason'=>'권한이 충분하지 않습니다'
+        'result' => false,
+        'reason' => '권한이 충분하지 않습니다'
     ]);
 }
 
 $src_target = $storage->$server;
-if($src_target){
+if ($src_target) {
     $src_target = $src_target[0];
 }
 
-if(!$allowFullUpdate || !$target){
+if (!$allowFullUpdate || !$target) {
     $target = $src_target;
-}
-else{
+} else {
     $target = $request['target'];
 }
 
 $baseServerName = Util::array_last_key(AppConf::getList());
 
-if(!$target && $server != $baseServerName){
+if (!$target && $server != $baseServerName) {
     Json::die([
-        'result'=>false,
-        'reason'=>'git -ish target이 제대로 지정되지 않았습니다.'
+        'result' => false,
+        'reason' => 'git -ish target이 제대로 지정되지 않았습니다.'
     ]);
 }
 
 
-$targetDir =$target.':'.$baseServerName;
+$targetDir = $target . ':' . $baseServerName;
 
-if(!key_exists($server, AppConf::getList())){
+if (!key_exists($server, AppConf::getList())) {
     Json::die([
-        'result'=>false,
-        'reason'=>'불가능한 서버 이름입니다.'
+        'result' => false,
+        'reason' => '불가능한 서버 이름입니다.'
     ]);
 }
 
-if(\file_exists($server) && !is_dir($server)){
+if (\file_exists($server) && !is_dir($server)) {
     Json::die([
-        'result'=>false,
-        'reason'=>'같은 이름을 가진 파일이 있습니다.'
+        'result' => false,
+        'reason' => '같은 이름을 가진 파일이 있습니다.'
     ]);
 }
 
-if(file_exists($server) && !is_writable($server)){
+if (file_exists($server) && !is_writable($server)) {
     Json::die([
-        'result'=>false,
-        'reason'=>$server.' 디렉토리 쓰기 권한이 없습니다.'
+        'result' => false,
+        'reason' => $server . ' 디렉토리 쓰기 권한이 없습니다.'
     ]);
 }
 
-if(!file_exists($server)){
-    if(!is_writable('.')){
+if (!file_exists($server)) {
+    if (!is_writable('.')) {
         Json::die([
-            'result'=>false,
-            'reason'=>$server.' 디렉토리가 없지만 생성할 권한이 없습니다.'
+            'result' => false,
+            'reason' => $server . ' 디렉토리가 없지만 생성할 권한이 없습니다.'
         ]);
     }
     mkdir($server, 0755);
 }
 
 
-if($server == $baseServerName){
+if ($server == $baseServerName) {
 
     exec("git fetch -q 2>&1", $output);
-    if($output){
+    if ($output) {
         Json::die([
-            'result'=>false,
-            'reason'=>'git pull 작업 : '.join(', ', $output)
+            'result' => false,
+            'reason' => 'git pull 작업 : ' . join(', ', $output)
         ]);
     }
 
-    if($target != $src_target){
+    if ($target != $src_target) {
         $command = sprintf('git checkout %s -q 2>&1', $target);
         exec($command, $output);
-        if($output){
+        if ($output) {
             Json::die([
-                'result'=>false,
-                'reason'=>join(', ', $output)
+                'result' => false,
+                'reason' => join(', ', $output)
             ]);
         }
     }
 
     exec("git pull -q 2>&1", $output);
-    if($output && $output[0] != 'Already up-to-date.'){
+    if ($output && $output[0] != 'Already up-to-date.') {
         Json::die([
-            'result'=>false,
-            'reason'=>'git pull 작업 : '.join(', ', $output)
+            'result' => false,
+            'reason' => 'git pull 작업 : ' . join(', ', $output)
         ]);
     }
 
     $version = getVersion();
     $result = Util::generateFileUsingSimpleTemplate(
-        __DIR__.'/'.$server.'/d_setting/VersionGit.orig.php',
-        __DIR__.'/'.$server.'/d_setting/VersionGit.php',[
-            'verionGit'=>$version
-        ], true
+        __DIR__ . '/' . $server . '/d_setting/VersionGit.orig.php',
+        __DIR__ . '/' . $server . '/d_setting/VersionGit.php',
+        [
+            'verionGit' => $version
+        ],
+        true
     );
-    
-    if(ServConfig::$imageRequestKey){
+
+    if (ServConfig::$imageRequestKey) {
         try {
             $imagePullPath = ServConfig::getImagePullURI();
             $pullResult = @file_get_contents($imagePullPath);
-            if($pullResult === false){
+            if ($pullResult === false) {
                 throw new \ErrorException('Invalid URI');
             }
             $pullResult = Json::decode($pullResult);
-            if($pullResult['result']){
+            if ($pullResult['result']) {
                 $imgResult = true;
                 $imgDetail = $pullResult['version'];
-            }
-            else{
+            } else {
                 $imgResult = false;
                 $imgDetail = $pullResult['reason'];
             }
-        }
-        catch(\Exception $e){
+        } catch (\Exception $e) {
             $imgResult = false;
             $imgDetail = $e->getMessage();
         }
-    }
-    else{
+    } else {
         $imgResult = true;
         $imgDetail = 'No key';
     }
-    
-    
+
+
 
     $storage->$server = [$target, $version];
     opcache_reset();
 
     Json::die([
-        'server'=>$server,
-        'result'=>true,
-        'version'=>$version,
-        'imgResult'=>$imgResult,
-        'imgDetail'=>$imgDetail,
+        'server' => $server,
+        'result' => true,
+        'version' => $version,
+        'imgResult' => $imgResult,
+        'imgDetail' => $imgDetail,
     ]);
-
 }
 
 $command = sprintf('git archive --format=zip -o %s %s', escapeshellarg($tmpFile), escapeshellarg($targetDir));
 exec("$command 2>&1", $output);
-if($output){
+if ($output) {
     Json::die([
-        'result'=>false,
-        'reason'=>join(', ', $output)
+        'result' => false,
+        'reason' => join(', ', $output)
     ]);
 }
 
 $zip = new \ZipArchive;
-if($zip->open($tmpFile) !== true){
+if ($zip->open($tmpFile) !== true) {
     Json::die([
-        'result'=>false,
-        'reason'=>'archive가 생성되지 않았습니다.'
+        'result' => false,
+        'reason' => 'archive가 생성되지 않았습니다.'
     ]);
 }
 
-if(!$zip->extractTo($server)){
+if (!$zip->extractTo($server)) {
     Json::die([
-        'result'=>false,
-        'reason'=>'생성한 archive를 제대로 옮기지 못했습니다.'
+        'result' => false,
+        'reason' => '생성한 archive를 제대로 옮기지 못했습니다.'
     ]);
 }
 
@@ -222,10 +219,12 @@ $zip->close();
 
 $version = getVersion($target);
 $result = Util::generateFileUsingSimpleTemplate(
-    __DIR__.'/'.$server.'/d_setting/VersionGit.orig.php',
-    __DIR__.'/'.$server.'/d_setting/VersionGit.php',[
-        'verionGit'=>$version
-    ], true
+    __DIR__ . '/' . $server . '/d_setting/VersionGit.orig.php',
+    __DIR__ . '/' . $server . '/d_setting/VersionGit.php',
+    [
+        'verionGit' => $version
+    ],
+    true
 );
 
 $storage->$server = [$target, $version];
@@ -233,7 +232,7 @@ $storage->$server = [$target, $version];
 opcache_reset();
 
 Json::die([
-    'server'=>$server,
-    'result'=>true,
-    'version'=>$version
-]);
+    'server' => $server,
+    'result' => true,
+    'version' => $version
+]);