Merge branch 'master' of github.com:gnuboard/g5

adm/admin.lib.php

@@ -379,6 +379,47 @@ function get_sanitize_input($s, $is_html=false){
     return $s;
 }
 
+function check_log_folder($log_path){
+
+    if( is_writable($log_path) ){
+
+        // 아파치 서버인 경우 웹에서 해당 폴더 접근 막기
+        $htaccess_file = $log_path.'/.htaccess';
+        if ( !file_exists( $htaccess_file ) ) {
+            if ( $handle = @fopen( $htaccess_file, 'w' ) ) {
+                fwrite( $handle, 'Order deny,allow' . "\n" );
+                fwrite( $handle, 'Deny from all' . "\n" );
+                fclose( $handle );
+            }
+        }
+        
+        // 아파치 서버인 경우 해당 디렉토리 파일 목록 안보이게 하기
+        $index_file = $log_path . '/index.php';
+        if ( !file_exists( $index_file ) ) {
+            if ( $handle = @fopen( $index_file, 'w' ) ) {
+                fwrite( $handle, '' );
+                fclose( $handle );
+            }
+        }
+    }
+    
+    // txt 파일과 log 파일을 조회하여 30일이 지난 파일은 삭제합니다.
+    $txt_files = glob($log_path.'/*.txt');
+    $log_files = glob($log_path.'/*.log');
+    
+    $del_files = array_merge($txt_files, $log_files);
+
+    if( $del_files && is_array($del_files) ){
+        foreach ($del_files as $del_file) {
+            $filetime = filemtime($del_file);
+            // 30일이 지난 파일을 삭제
+            if($filetime && $filetime < (G5_SERVER_TIME - 2592000)) {
+                @unlink($del_file);
+            }
+        }
+    }
+}
+
 // POST로 넘어온 토큰과 세션에 저장된 토큰 비교
 function check_admin_token()
 {
@@ -435,7 +476,7 @@ function admin_check_xss_params($params){
         if ( empty($value) ) continue;
 
         if( is_array($value) ){
-            admin_check_xss_params($params);
+            admin_check_xss_params($value);
         } else if ( preg_match('/<\s?[^\>]*\/?\s?>/i', $value) && (preg_match('/script.*?\/script/ius', $value) || preg_match('/onload=.*/ius', $value)) ){
             alert('요청 쿼리에 잘못된 스크립트문장이 있습니다.\\nXSS 공격일수도 있습니다.');
             die();

adm/board_copy_update.php

@@ -38,43 +38,43 @@ $sql = " insert into {$g5['board_table']}
                 bo_subject = '$target_subject',
                 bo_device = '{$board['bo_device']}',
                 bo_admin = '{$board['bo_admin']}',
-                bo_list_level = '{$board[bo_list_level]}',
-                bo_read_level = '{$board[bo_read_level]}',
-                bo_write_level = '{$board[bo_write_level]}',
-                bo_reply_level = '{$board[bo_reply_level]}',
-                bo_comment_level = '{$board[bo_comment_level]}',
-                bo_upload_level = '{$board[bo_upload_level]}',
-                bo_download_level = '{$board[bo_download_level]}',
-                bo_html_level = '{$board[bo_html_level]}',
-                bo_link_level = '{$board[bo_link_level]}',
-                bo_count_modify = '{$board[bo_count_modify]}',
-                bo_count_delete = '{$board[bo_count_delete]}',
-                bo_read_point = '{$board[bo_read_point]}',
-                bo_write_point = '{$board[bo_write_point]}',
-                bo_comment_point = '{$board[bo_comment_point]}',
-                bo_download_point = '{$board[bo_download_point]}',
-                bo_use_category = '{$board[bo_use_category]}',
+                bo_list_level = '{$board['bo_list_level']}',
+                bo_read_level = '{$board['bo_read_level']}',
+                bo_write_level = '{$board['bo_write_level']}',
+                bo_reply_level = '{$board['bo_reply_level']}',
+                bo_comment_level = '{$board['bo_comment_level']}',
+                bo_upload_level = '{$board['bo_upload_level']}',
+                bo_download_level = '{$board['bo_download_level']}',
+                bo_html_level = '{$board['bo_html_level']}',
+                bo_link_level = '{$board['bo_link_level']}',
+                bo_count_modify = '{$board['bo_count_modify']}',
+                bo_count_delete = '{$board['bo_count_delete']}',
+                bo_read_point = '{$board['bo_read_point']}',
+                bo_write_point = '{$board['bo_write_point']}',
+                bo_comment_point = '{$board['bo_comment_point']}',
+                bo_download_point = '{$board['bo_download_point']}',
+                bo_use_category = '{$board['bo_use_category']}',
                 bo_category_list = '{$board['bo_category_list']}',
-                bo_use_sideview = '{$board[bo_use_sideview]}',
-                bo_use_file_content = '{$board[bo_use_file_content]}',
-                bo_use_secret = '{$board[bo_use_secret]}',
-                bo_use_dhtml_editor = '{$board[bo_use_dhtml_editor]}',
-                bo_use_rss_view = '{$board[bo_use_rss_view]}',
-                bo_use_good = '{$board[bo_use_good]}',
-                bo_use_nogood = '{$board[bo_use_nogood]}',
-                bo_use_name = '{$board[bo_use_name]}',
-                bo_use_signature = '{$board[bo_use_signature]}',
-                bo_use_ip_view = '{$board[bo_use_ip_view]}',
+                bo_use_sideview = '{$board['bo_use_sideview']}',
+                bo_use_file_content = '{$board['bo_use_file_content']}',
+                bo_use_secret = '{$board['bo_use_secret']}',
+                bo_use_dhtml_editor = '{$board['bo_use_dhtml_editor']}',
+                bo_use_rss_view = '{$board['bo_use_rss_view']}',
+                bo_use_good = '{$board['bo_use_good']}',
+                bo_use_nogood = '{$board['bo_use_nogood']}',
+                bo_use_name = '{$board['bo_use_name']}',
+                bo_use_signature = '{$board['bo_use_signature']}',
+                bo_use_ip_view = '{$board['bo_use_ip_view']}',
                 bo_use_list_view = '{$board['bo_use_list_view']}',
-                bo_use_list_content = '{$board[bo_use_list_content]}',
-                bo_table_width = '{$board[bo_table_width]}',
-                bo_subject_len = '{$board[bo_subject_len]}',
-                bo_mobile_subject_len = '{$board[bo_mobile_subject_len]}',
-                bo_page_rows = '{$board[bo_page_rows]}',
-                bo_mobile_page_rows = '{$board[bo_mobile_page_rows]}',
-                bo_new = '{$board[bo_new]}',
-                bo_hot = '{$board[bo_hot]}',
-                bo_image_width = '{$board[bo_image_width]}',
+                bo_use_list_content = '{$board['bo_use_list_content']}',
+                bo_table_width = '{$board['bo_table_width']}',
+                bo_subject_len = '{$board['bo_subject_len']}',
+                bo_mobile_subject_len = '{$board['bo_mobile_subject_len']}',
+                bo_page_rows = '{$board['bo_page_rows']}',
+                bo_mobile_page_rows = '{$board['bo_mobile_page_rows']}',
+                bo_new = '{$board['bo_new']}',
+                bo_hot = '{$board['bo_hot']}',
+                bo_image_width = '{$board['bo_image_width']}',
                 bo_skin = '{$board['bo_skin']}',
                 bo_mobile_skin = '{$board['bo_mobile_skin']}',
                 bo_include_head = '{$board['bo_include_head']}',
@@ -84,20 +84,21 @@ $sql = " insert into {$g5['board_table']}
                 bo_mobile_content_head = '".addslashes($board['bo_mobile_content_head'])."',
                 bo_mobile_content_tail = '".addslashes($board['bo_mobile_content_tail'])."',
                 bo_insert_content = '".addslashes($board['bo_insert_content'])."',
-                bo_gallery_cols = '{$board[bo_gallery_cols]}',
-                bo_gallery_width = '{$board[bo_gallery_width]}',
-                bo_gallery_height = '{$board[bo_gallery_height]}',
-                bo_mobile_gallery_width = '{$board[bo_mobile_gallery_width]}',
-                bo_mobile_gallery_height = '{$board[bo_mobile_gallery_height]}',
-                bo_upload_size = '{$board[bo_upload_size]}',
-                bo_reply_order = '{$board[bo_reply_order]}',
-                bo_use_search = '{$board[bo_use_search]}',
-                bo_order = '{$board[bo_order]}',
+                bo_gallery_cols = '{$board['bo_gallery_cols']}',
+                bo_gallery_width = '{$board['bo_gallery_width']}',
+                bo_gallery_height = '{$board['bo_gallery_height']}',
+                bo_mobile_gallery_width = '{$board['bo_mobile_gallery_width']}',
+                bo_mobile_gallery_height = '{$board['bo_mobile_gallery_height']}',
+                bo_upload_size = '{$board['bo_upload_size']}',
+                bo_reply_order = '{$board['bo_reply_order']}',
+                bo_use_search = '{$board['bo_use_search']}',
+                bo_order = '{$board['bo_order']}',
                 bo_notice = '{$board['bo_notice']}',
-                bo_upload_count = '{$board[bo_upload_count]}',
-                bo_use_email = '{$board[bo_use_email]}',
-                bo_use_cert = '{$board[bo_use_cert]}',
-                bo_use_sns = '{$board[bo_use_sns]}',
+                bo_upload_count = '{$board['bo_upload_count']}',
+                bo_use_email = '{$board['bo_use_email']}',
+                bo_use_cert = '{$board['bo_use_cert']}',
+                bo_use_sns = '{$board['bo_use_sns']}',
+                bo_use_captcha = '{$board['bo_use_captcha']}',
                 bo_sort_field = '{$board['bo_sort_field']}',
                 bo_1_subj = '".addslashes($board['bo_1_subj'])."',
                 bo_2_subj = '".addslashes($board['bo_2_subj'])."',

adm/sms_admin/emoticon_move_update.php

@@ -6,6 +6,8 @@ auth_check($auth[$sub_menu], "r");
 if(!count($_POST['chk_fg_no']))
     alert('이모티콘을 이동할 그룹을 한개 이상 선택해 주십시오.', $url);
 
+$fo_no_list = preg_replace('/[^a-zA-Z0-9\, ]/', '', $fo_no_list);
+
 $sql = "select * from {$g5['sms5_form_table']} where fo_no in ($fo_no_list) order by fo_no desc ";
 $result = sql_query($sql);
 $save = array();

adm/sms_admin/history_num.php

@@ -16,6 +16,10 @@ if ($st && trim($sv))
 else
     $sql_search = "";
 
+if( isset($st) && !in_array($st, array('hs_name', 'hs_hp', 'bk_no')) ){
+    $st = '';
+}
+
 $total_res = sql_fetch("select count(*) as cnt from {$g5['sms5_history_table']} where 1 $sql_search");
 $total_count = $total_res['cnt'];
 

adm/sms_admin/history_view.php

@@ -8,6 +8,10 @@ $colspan = 10;
 $st = isset($st) ? strip_tags($st) : '';
 $ssv = isset($ssv) ? strip_tags($ssv) : '';
 
+if( $st && !in_array($st, array('hs_name', 'hs_hp', 'bk_no')) ){
+    $st = '';
+}
+
 auth_check($auth[$sub_menu], "r");
 
 $g5['title'] = "문자전송 상세내역";

adm/sms_admin/num_book_move.php

@@ -31,8 +31,8 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
 
     <form name="fboardmoveall" method="post" action="./number_move_update.php" onsubmit="return fboardmoveall_submit(this);">
     <input type="hidden" name="sw" value="<?php echo $sw ?>">
-    <input type="hidden" name="bk_no_list" value="<?php echo $bk_no_list ?>">
-    <input type="hidden" name="act" value="<?php echo $act ?>">
+    <input type="hidden" name="bk_no_list" value="<?php echo get_sanitize_input($bk_no_list); ?>">
+    <input type="hidden" name="act" value="<?php echo get_sanitize_input($act); ?>">
     <input type="hidden" name="url" value="<?php echo clean_xss_tags(strip_tags($_SERVER['HTTP_REFERER'])); ?>">
     <div class=" new_win_con"> 
         <div class="tbl_head01 tbl_wrap">

adm/sms_admin/number_move_update.php

@@ -6,6 +6,8 @@ auth_check($auth[$sub_menu], "r");
 if(!count($_POST['chk_bg_no']))
     alert('번호를 '.$act.'할 그룹을 한개 이상 선택해 주십시오.', $url);
 
+$bk_no_list = preg_replace('/[^a-zA-Z0-9\, ]/', '', $bk_no_list);
+
 $sql = "select * from {$g5['sms5_book_table']} where bk_no in ($bk_no_list) order by bk_no desc ";
 $result = sql_query($sql);
 $save = array();

bbs/move_update.php

@@ -125,7 +125,7 @@ while ($row = sql_fetch_array($result))
                         // 제이프로님 코드제안 적용
                         $copy_file_name = ($bo_table !== $move_bo_table) ? $row3['bf_file'] : $row2['wr_id'].'_copy_'.$insert_id.'_'.$row3['bf_file'];
                         @copy($src_dir.'/'.$row3['bf_file'], $dst_dir.'/'.$copy_file_name);
-                        @chmod($dst_dir/$row3['bf_file'], G5_FILE_PERMISSION);
+                        @chmod($dst_dir.'/'.$row3['bf_file'], G5_FILE_PERMISSION);
                     }
 
                     $sql = " insert into {$g5['board_file_table']}

config.php

@@ -5,7 +5,7 @@
 ********************/
 
 define('G5_VERSION', '그누보드5');
-define('G5_GNUBOARD_VER', '5.3.2.2');
+define('G5_GNUBOARD_VER', '5.3.2.4');
 
 // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음
 define('_GNUBOARD_', true);

lib/common.lib.php

@@ -3489,8 +3489,10 @@ function is_include_path_check($path='', $is_input='')
 {
     if( $path ){
         if ($is_input){
+            // 장태진 @jtjisgod <jtjisgod@gmail.com> 추가
+            // 보안 목적 : rar wrapper 차단
 
-            if( stripos($path, 'php:') !== false || stripos($path, 'zlib:') !== false || stripos($path, 'bzip2:') !== false || stripos($path, 'zip:') !== false || stripos($path, 'data:') !== false || stripos($path, 'phar:') !== false ){
+            if( stripos($path, 'rar:') !== false || stripos($path, 'php:') !== false || stripos($path, 'zlib:') !== false || stripos($path, 'bzip2:') !== false || stripos($path, 'zip:') !== false || stripos($path, 'data:') !== false || stripos($path, 'phar:') !== false ){
                 return false;
             }
 

lib/thumbnail.lib.php

@@ -25,29 +25,31 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_
         $matches = get_editor_image($write['wr_content'], false);
         $edt = true;
 
-        for($i=0; $i<count($matches[1]); $i++)
-        {
-            // 이미지 path 구함
-            $p = parse_url($matches[1][$i]);
-            if(strpos($p['path'], '/'.G5_DATA_DIR.'/') != 0)
-                $data_path = preg_replace('/^\/.*\/'.G5_DATA_DIR.'/', '/'.G5_DATA_DIR, $p['path']);
-            else
-                $data_path = $p['path'];
+        if(isset($matches[1]) && is_array($matches[1])){
+            for($i=0; $i<count($matches[1]); $i++)
+            {
+                // 이미지 path 구함
+                $p = parse_url($matches[1][$i]);
+                if(strpos($p['path'], '/'.G5_DATA_DIR.'/') != 0)
+                    $data_path = preg_replace('/^\/.*\/'.G5_DATA_DIR.'/', '/'.G5_DATA_DIR, $p['path']);
+                else
+                    $data_path = $p['path'];
 
-            $srcfile = G5_PATH.$data_path;
+                $srcfile = G5_PATH.$data_path;
 
-            if(preg_match("/\.({$config['cf_image_extension']})$/i", $srcfile) && is_file($srcfile)) {
-                $size = @getimagesize($srcfile);
-                if(empty($size))
-                    continue;
+                if(preg_match("/\.({$config['cf_image_extension']})$/i", $srcfile) && is_file($srcfile)) {
+                    $size = @getimagesize($srcfile);
+                    if(empty($size))
+                        continue;
 
-                $filename = basename($srcfile);
-                $filepath = dirname($srcfile);
+                    $filename = basename($srcfile);
+                    $filepath = dirname($srcfile);
 
-                preg_match("/alt=[\"\']?([^\"\']*)[\"\']?/", $matches[0][$i], $malt);
-                $alt = get_text($malt[1]);
+                    preg_match("/alt=[\"\']?([^\"\']*)[\"\']?/", $matches[0][$i], $malt);
+                    $alt = get_text($malt[1]);
 
-                break;
+                    break;
+                }
             }
         }
     }

mobile/skin/content/basic/style.css

@@ -4,5 +4,6 @@
 #ctt {margin:10px 0;padding:10px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9}
 .ctt_admin {margin:0 5px;text-align:right}
 #ctt header h1 {position:absolute;font-size:0;line-height:0;overflow:hidden}
+#ctt_himg img, #ctt_timg img, #ctt_con img {max-width:100%;height:auto}
 #ctt_con {padding:10px 0}
 .ctt_img {text-align:center}

plugin/htmlpurifier/safeiframe.txt

@@ -11,4 +11,5 @@ www.microsoft.com/showcase/video.aspx/
 w.soundcloud.com/
 www.facebook.com/
 kakaotv.daum.net/
-v.afree.ca/
+v.afree.ca/
+play-tv.kakao.com/

plugin/lgxpay/lgdacom/XPayClient.php

@@ -143,7 +143,7 @@ class XPayClient
         // log_dir 재설정
         $this->config["log_dir"] = $home_dir."/log";
 
-		$this->log_file = $this->config["log_dir"] . "/log_" . date("Ymd") . ".log";
+		$this->log_file = $this->config["log_dir"] . "/log_" . date("Ymd") . '_' . substr(md5(mt_rand()), 0, 12) . ".log";
 		// make log directory if does not exist
 		if (!file_exists($this->config["log_dir"])) {
 			mkdir($this->config["log_dir"], "0777", true);
@@ -604,6 +604,10 @@ class XPayClient
 
 	function Log($msg, $level=LGD_LOG_FATAL)
 	{
+        if( !(defined('LGD_LOG_SAVE') && LGD_LOG_SAVE) ){
+            return;
+        }
+
 		if ($level > $this->config["log_level"])
 			return;
 		$err_msg = date("Y-m-d H:i:s")." [".$this->err_label[$level]."] [".$this->TX_ID."] ".$msg."\n";

plugin/lgxpay/lgdacom/XPayClient4DB.php

@@ -141,7 +141,7 @@ class XPayClient
 		$array3 = array($mid => $mertkey);
 		$this->config = $array1 + $array2 + $array3;
 		
-		$this->log_file = $this->config["log_dir"] . "/log_" . date("Ymd") . ".log";
+		$this->log_file = $this->config["log_dir"] . "/log_" . date("Ymd") . '_' . substr(md5(mt_rand()), 0, 12) . ".log";
 		// make log directory if does not exist
 		if (!file_exists($this->config["log_dir"])) {
 			mkdir($this->config["log_dir"], "0777", true);
@@ -602,6 +602,10 @@ class XPayClient
 
 	function Log($msg, $level=LGD_LOG_FATAL)
 	{
+        if( !(defined('LGD_LOG_SAVE') && LGD_LOG_SAVE) ){
+            return;
+        }
+
 		if ($level > $this->config["log_level"])
 			return;
 		$err_msg = date("Y-m-d H:i:s")." [".$this->err_label[$level]."] [".$this->TX_ID."] ".$msg."\n";

skin/content/basic/style.css

@@ -5,5 +5,5 @@
 .ctt_admin {text-align:right}
 #ctt header h1 {position:absolute;font-size:0;line-height:0;overflow:hidden}
 #ctt_con {padding:10px 0;line-height:1.6em}
-#ctt_con img{max-width:100%;height:auto}
+#ctt_himg img, #ctt_timg img, #ctt_con img {max-width:100%;height:auto}
 .ctt_img {text-align:center}

theme/basic/mobile/skin/content/basic/style.css

@@ -4,5 +4,6 @@
 #ctt {margin:10px 0;padding:10px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9}
 .ctt_admin {margin:0 5px;text-align:right}
 #ctt header h1 {position:absolute;font-size:0;line-height:0;overflow:hidden}
+#ctt_himg img, #ctt_timg img, #ctt_con img {max-width:100%;height:auto}
 #ctt_con {padding:10px 0}
 .ctt_img {text-align:center}

theme/basic/skin/content/basic/style.css

@@ -5,5 +5,5 @@
 .ctt_admin {text-align:right}
 #ctt header h1 {position:absolute;font-size:0;line-height:0;overflow:hidden}
 #ctt_con {padding:10px 0;line-height:1.6em}
-#ctt_con img{max-width:100%;height:auto}
+#ctt_himg img, #ctt_timg img, #ctt_con img {max-width:100%;height:auto}
 .ctt_img {text-align:center}