From 97ee35e985997a9b9daddf8fb3dde753ef8b47c4 Mon Sep 17 00:00:00 2001 From: thisgun Date: Fri, 7 Dec 2018 10:59:59 +0900 Subject: [PATCH 1/7] =?UTF-8?q?KVE-2018-1316=20=EC=B7=A8=EC=95=BD=EC=A0=90?= =?UTF-8?q?=20=EB=8B=A4=EC=8B=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common.lib.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index c07a23194..2ee0ad6c3 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -2883,9 +2883,15 @@ function get_search_string($stx) // XSS 관련 태그 제거 function clean_xss_tags($str) { - $str = preg_replace('#]*+>#i', '', $str); - - $str = str_replace(array('',''), '', $str); + $str_len = strlen($str); + + while($i <= $str_len){ + $result = preg_replace('#]*+>#i', '', $str); + if((string)$result === (string)$str) + break; + $str = $result; + $i++; + } return $str; } From 14f55f75191216d6d41fff754733c1c0f167b1b2 Mon Sep 17 00:00:00 2001 From: thisgun Date: Tue, 11 Dec 2018 16:52:46 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=EC=98=A4=ED=83=80=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/kcpcert/kcpcert_result.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/kcpcert/kcpcert_result.php b/plugin/kcpcert/kcpcert_result.php index 031942fa9..5468267ae 100644 --- a/plugin/kcpcert/kcpcert_result.php +++ b/plugin/kcpcert/kcpcert_result.php @@ -143,7 +143,7 @@ if( $cert_enc_use == "Y" ) $sql = " select mb_id from {$g5['member_table']} where mb_id <> '{$member['mb_id']}' and mb_dupinfo = '{$mb_dupinfo}' "; $row = sql_fetch($sql); if ($row['mb_id']) { - alert_close("입력하신 본인학인 정보로 가입된 내역이 존재합니다.\\n회원아이디 : ".$row['mb_id']); + alert_close("입력하신 본인확인 정보로 가입된 내역이 존재합니다.\\n회원아이디 : ".$row['mb_id']); } // hash 데이터 From 82078fc781fbcc5ed75fff7b0e451f5fd95ae357 Mon Sep 17 00:00:00 2001 From: thisgun Date: Tue, 11 Dec 2018 17:20:55 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EB=8B=A4=EC=9A=B4?= =?UTF-8?q?=EB=A1=9C=EB=93=9C=EC=8B=9C=20=ED=95=9C=EA=B8=80=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=EB=AA=85=20=EC=9D=B4=EC=8A=88=20=EB=8B=A4=EC=8B=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/download.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bbs/download.php b/bbs/download.php index a69f52b6c..575f8571f 100644 --- a/bbs/download.php +++ b/bbs/download.php @@ -84,11 +84,16 @@ if (!get_session($ss_name)) $g5['title'] = '다운로드 > '.conv_subject($write['wr_subject'], 255); //파일명에 한글이 있는 경우 +/* if(preg_match("/[\xA1-\xFE][\xA1-\xFE]/", $file['bf_source'])){ + // 2015.09.02 날짜의 파이어폭스에서 인코딩된 문자 그대로 출력되는 문제가 발생됨, 2018.12.11 날짜의 파이어폭스에서는 해당 현상이 없으므로 해당 코드를 사용 안합니다. $original = iconv('utf-8', 'euc-kr', $file['bf_source']); // SIR 잉끼님 제안코드 } else { $original = urlencode($file['bf_source']); } +*/ + +$original = urlencode($file['bf_source']); @include_once($board_skin_path.'/download.tail.skin.php'); From 038affe79835047f096e7c3c68e39bcea31e2064 Mon Sep 17 00:00:00 2001 From: thisgun Date: Wed, 12 Dec 2018 17:28:55 +0900 Subject: [PATCH 4/7] =?UTF-8?q?KVE-2018-1808=20=EC=B7=A8=EC=95=BD=EC=A0=90?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/admin.lib.php | 2 +- bbs/alert.php | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/adm/admin.lib.php b/adm/admin.lib.php index b62164b26..d454f00d4 100644 --- a/adm/admin.lib.php +++ b/adm/admin.lib.php @@ -436,7 +436,7 @@ function admin_check_xss_params($params){ if( is_array($value) ){ admin_check_xss_params($params); - } else if ( preg_match('/<\s?[^\>]*\/?\s?>/i', $value) && preg_match('/script.*?\/script/ius', $value) ){ + } else if ( preg_match('/<\s?[^\>]*\/?\s?>/i', $value) && (preg_match('/script.*?\/script/ius', $value) || preg_match('/onload=.*/ius', $value)) ){ alert('요청 쿼리에 잘못된 스크립트문장이 있습니다.\\nXSS 공격일수도 있습니다.'); die(); } diff --git a/bbs/alert.php b/bbs/alert.php index 9d4475203..b1117d347 100644 --- a/bbs/alert.php +++ b/bbs/alert.php @@ -67,13 +67,17 @@ history.back();
$value) { + + $key = clean_xss_tags($url); + $value = clean_xss_tags($value); + if(strlen($value) < 1) continue; if(preg_match("/pass|pwd|capt|url/", $key)) continue; ?> - + From 39c8182a2fd2aef621d589a6bd4ee4c17b9814b5 Mon Sep 17 00:00:00 2001 From: thisgun Date: Thu, 13 Dec 2018 10:13:05 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=EC=86=8C=EC=85=9C=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8=EC=8B=9C=20=EC=A0=95=EB=B3=B4=EC=88=98=EC=A0=95?= =?UTF-8?q?=EC=97=90=20=EA=B4=80=ED=95=9C=20=EC=BD=94=EB=93=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/member_confirm.php | 2 +- plugin/social/includes/functions.php | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/bbs/member_confirm.php b/bbs/member_confirm.php index e3fc28498..dcfbfec7a 100644 --- a/bbs/member_confirm.php +++ b/bbs/member_confirm.php @@ -14,7 +14,7 @@ else $url = clean_xss_tags($_GET['url']); //소셜 로그인 한 경우 -if( function_exists('social_member_comfirm_redirect') && (! $url || $url === 'register_form.php') ){ +if( function_exists('social_member_comfirm_redirect') && (! $url || $url === 'register_form.php' || (function_exists('social_is_edit_page') && social_is_edit_page($url) ) ) ){ social_member_comfirm_redirect(); } diff --git a/plugin/social/includes/functions.php b/plugin/social/includes/functions.php index 4b847f54d..c6ec4d512 100644 --- a/plugin/social/includes/functions.php +++ b/plugin/social/includes/functions.php @@ -764,6 +764,23 @@ function social_member_comfirm_redirect(){ } } +function social_is_edit_page($url=''){ + global $is_member; + + if( !$is_member ) return false; + + if($url){ + $p = @parse_url($url); + $host = preg_replace('/:[0-9]+$/', '', $_SERVER['HTTP_HOST']); + + if ( isset($p['host']) && ($p['host'] === $host) && preg_match('/register_form\.php$/i', $url) ){ + return true; + } + } + + return false; +} + function social_is_login_password_check($mb_id){ global $g5; From 53457e3b2f9597d8870995d40e6d1ec08484ee2e Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 17 Dec 2018 18:44:14 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=EC=86=8C=EC=85=9C=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8=20=ED=8A=B8=EC=9C=84=ED=84=B0=20callback=5Furl=20?= =?UTF-8?q?=ED=91=9C=EA=B8=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/social/includes/functions.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugin/social/includes/functions.php b/plugin/social/includes/functions.php index c6ec4d512..fab949a88 100644 --- a/plugin/social/includes/functions.php +++ b/plugin/social/includes/functions.php @@ -52,6 +52,10 @@ function get_social_callbackurl($provider, $no_domain=false){ $base_url = '/'.ltrim(parse_url($base_url, PHP_URL_PATH), '/'); } + if ( $provider === 'twitter' ){ + return $base_url; + } + $base_url = $base_url . ( strpos($base_url, '?') ? '&' : '?' ).G5_SOCIAL_LOGIN_DONE_PARAM.'='.$provider; return $base_url; From c028d34f787b58ef54d1d965e4d61ab10eb5e62f Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 17 Dec 2018 18:47:40 +0900 Subject: [PATCH 7/7] =?UTF-8?q?5.3.2.2=20=EB=B2=84=EC=A0=84=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.php b/config.php index 802cde66d..e417624fd 100644 --- a/config.php +++ b/config.php @@ -5,7 +5,7 @@ ********************/ define('G5_VERSION', '그누보드5'); -define('G5_GNUBOARD_VER', '5.3.2.1'); +define('G5_GNUBOARD_VER', '5.3.2.2'); // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음 define('_GNUBOARD_', true);