From ad2419026a70bef3160423c6889065f5f0160988 Mon Sep 17 00:00:00 2001 From: thisgun Date: Tue, 30 Oct 2018 16:09:56 +0900 Subject: [PATCH 01/19] =?UTF-8?q?=EC=9E=98=EB=AA=BB=EB=90=9C=20php=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/new_delete.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bbs/new_delete.php b/bbs/new_delete.php index 45341a244..6791e33e3 100644 --- a/bbs/new_delete.php +++ b/bbs/new_delete.php @@ -128,7 +128,7 @@ for($i=0;$i Date: Fri, 16 Nov 2018 10:55:56 +0900 Subject: [PATCH 02/19] =?UTF-8?q?KVE-2018-0979=20=EA=B7=B8=EB=88=84?= =?UTF-8?q?=EB=B3=B4=EB=93=9C=20=EC=98=81=EC=B9=B4=ED=8A=B8=20lgxpay=20XSS?= =?UTF-8?q?=20=EC=B7=A8=EC=95=BD=EC=A0=90=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/lgxpay/AuthOnlyReq.php | 2 ++ plugin/lgxpay/returnurl.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/plugin/lgxpay/AuthOnlyReq.php b/plugin/lgxpay/AuthOnlyReq.php index f8c42b1b6..571d7d9c9 100644 --- a/plugin/lgxpay/AuthOnlyReq.php +++ b/plugin/lgxpay/AuthOnlyReq.php @@ -165,6 +165,8 @@ $_SESSION['lgd_certify'] = $payReqMap; $value) { + $key = htmlspecialchars(strip_tags($key)); + $value = htmlspecialchars(strip_tags($value)); echo "".PHP_EOL; } ?> diff --git a/plugin/lgxpay/returnurl.php b/plugin/lgxpay/returnurl.php index e0cd0a37b..b40e8940e 100644 --- a/plugin/lgxpay/returnurl.php +++ b/plugin/lgxpay/returnurl.php @@ -57,6 +57,8 @@ $payReqMap = $_SESSION['lgd_certify'];//결제 요청시, Session에 저장했
$value) { + $key = htmlspecialchars(strip_tags($key)); + $value = htmlspecialchars(strip_tags($value)); echo ""; } ?> From ccba200fbdcbad9f4a75ebf27eddb1341cd5628d Mon Sep 17 00:00:00 2001 From: thisgun Date: Fri, 16 Nov 2018 11:15:10 +0900 Subject: [PATCH 03/19] =?UTF-8?q?=EC=9E=98=EB=AA=BB=EB=90=9C=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/contentform.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adm/contentform.php b/adm/contentform.php index 7ebe8bf01..6217e4603 100644 --- a/adm/contentform.php +++ b/adm/contentform.php @@ -109,8 +109,8 @@ include_once (G5_ADMIN_PATH.'/admin.head.php'); From bc5779fafbd9a363b0b392c2b30b03f70d1b87f8 Mon Sep 17 00:00:00 2001 From: thisgun Date: Fri, 16 Nov 2018 17:54:57 +0900 Subject: [PATCH 04/19] =?UTF-8?q?KVE-2018-1316=20=EA=B7=B8=EB=88=84?= =?UTF-8?q?=EB=B3=B4=EB=93=9C,=EC=98=81=EC=B9=B4=ED=8A=B8=20=EC=B7=A8?= =?UTF-8?q?=EC=95=BD=EC=A0=90=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/confirm.php | 6 +++--- bbs/member_confirm.php | 9 +++++++-- lib/common.lib.php | 2 ++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/bbs/confirm.php b/bbs/confirm.php index fcf94e0e9..a80f5eab1 100644 --- a/bbs/confirm.php +++ b/bbs/confirm.php @@ -2,9 +2,9 @@ include_once('./_common.php'); include_once(G5_PATH.'/head.sub.php'); -$url1 = clean_xss_tags($url1); -$url2 = clean_xss_tags($url2); -$url3 = clean_xss_tags($url3); +$url1 = preg_replace("/[\<\>\'\"\\\'\\\"\(\)]/", "", clean_xss_tags($url1)); +$url2 = preg_replace("/[\<\>\'\"\\\'\\\"\(\)]/", "", clean_xss_tags($url2)); +$url3 = preg_replace("/[\<\>\'\"\\\'\\\"\(\)]/", "", clean_xss_tags($url3)); // url 체크 check_url_host($url1); diff --git a/bbs/member_confirm.php b/bbs/member_confirm.php index 722a78302..e3fc28498 100644 --- a/bbs/member_confirm.php +++ b/bbs/member_confirm.php @@ -24,10 +24,15 @@ include_once('./_head.sub.php'); // url 체크 check_url_host($url, '', G5_URL, true); -if( preg_match('#^/{3,}#', $url) ){ - $url = preg_replace('#^/{3,}#', '/', $url); +if($url){ + $url = preg_replace('#^/\\\{1,}#', '/', $url); + + if( preg_match('#^/{3,}#', $url) ){ + $url = preg_replace('#^/{3,}#', '/', $url); + } } + $url = get_text($url); include_once($member_skin_path.'/member_confirm.skin.php'); diff --git a/lib/common.lib.php b/lib/common.lib.php index c12ff17e3..5391220b6 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -2885,6 +2885,8 @@ function clean_xss_tags($str) { $str = preg_replace('#]*+>#i', '', $str); + $str = str_replace(array('',''), '', $str); + return $str; } From e14f25d10f58ff96ace6f5ddc531c5be936db1df Mon Sep 17 00:00:00 2001 From: thisgun Date: Wed, 21 Nov 2018 14:55:57 +0900 Subject: [PATCH 05/19] =?UTF-8?q?KVE-2018-1403=20=EC=B7=A8=EC=95=BD?= =?UTF-8?q?=EC=A0=90=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/menu_list_update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/menu_list_update.php b/adm/menu_list_update.php index 4244d3343..324f26209 100644 --- a/adm/menu_list_update.php +++ b/adm/menu_list_update.php @@ -23,7 +23,7 @@ for ($i=0; $i<$count; $i++) $code = $_POST['code'][$i]; $me_name = $_POST['me_name'][$i]; - $me_link = preg_match('/^javascript/', $_POST['me_link'][$i]) ? G5_URL : strip_tags($_POST['me_link'][$i]); + $me_link = preg_match('/^javascript/i', $_POST['me_link'][$i]) ? G5_URL : strip_tags($_POST['me_link'][$i]); if(!$code || !$me_name || !$me_link) continue; From 30a0016d0bbd8a475bee8e45ce4202bfd51b7758 Mon Sep 17 00:00:00 2001 From: thisgun Date: Wed, 21 Nov 2018 15:03:33 +0900 Subject: [PATCH 06/19] =?UTF-8?q?=EC=9E=98=EB=AA=BB=EB=90=9C=20=EA=B2=8C?= =?UTF-8?q?=EC=8B=9C=ED=8C=90=20=EC=8A=A4=ED=82=A8=20css=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/board/basic/style.css | 2 +- skin/board/gallery/style.css | 2 +- theme/basic/skin/board/basic/style.css | 2 +- theme/basic/skin/board/gallery/style.css | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/skin/board/basic/style.css b/skin/board/basic/style.css index 37bf7fab7..d85f02315 100644 --- a/skin/board/basic/style.css +++ b/skin/board/basic/style.css @@ -65,7 +65,7 @@ #bo_w .tbl_frm01 {} #bo_w .tbl_frm01 th {} #bo_w .tbl_frm01 td {} -#bo_w .tbl_frm01 textarea, #bo_w tbl_frm01 .frm_input {} +#bo_w .tbl_frm01 textarea, #bo_w .tbl_frm01 .frm_input {} #bo_w .tbl_frm01 textarea {} /* #bo_w .tbl_frm01 #captcha {} diff --git a/skin/board/gallery/style.css b/skin/board/gallery/style.css index 7dd98d16b..cb38ea31f 100644 --- a/skin/board/gallery/style.css +++ b/skin/board/gallery/style.css @@ -55,7 +55,7 @@ #bo_w .tbl_frm01 {} #bo_w .tbl_frm01 th {} #bo_w .tbl_frm01 td {} -#bo_w .tbl_frm01 textarea, #bo_w tbl_frm01 .frm_input {} +#bo_w .tbl_frm01 textarea, #bo_w .tbl_frm01 .frm_input {} #bo_w .tbl_frm01 textarea {} /* #bo_w .tbl_frm01 #captcha {} diff --git a/theme/basic/skin/board/basic/style.css b/theme/basic/skin/board/basic/style.css index 37bf7fab7..d85f02315 100644 --- a/theme/basic/skin/board/basic/style.css +++ b/theme/basic/skin/board/basic/style.css @@ -65,7 +65,7 @@ #bo_w .tbl_frm01 {} #bo_w .tbl_frm01 th {} #bo_w .tbl_frm01 td {} -#bo_w .tbl_frm01 textarea, #bo_w tbl_frm01 .frm_input {} +#bo_w .tbl_frm01 textarea, #bo_w .tbl_frm01 .frm_input {} #bo_w .tbl_frm01 textarea {} /* #bo_w .tbl_frm01 #captcha {} diff --git a/theme/basic/skin/board/gallery/style.css b/theme/basic/skin/board/gallery/style.css index e20ab1c66..035553804 100644 --- a/theme/basic/skin/board/gallery/style.css +++ b/theme/basic/skin/board/gallery/style.css @@ -55,7 +55,7 @@ #bo_w .tbl_frm01 {} #bo_w .tbl_frm01 th {} #bo_w .tbl_frm01 td {} -#bo_w .tbl_frm01 textarea, #bo_w tbl_frm01 .frm_input {} +#bo_w .tbl_frm01 textarea, #bo_w .tbl_frm01 .frm_input {} #bo_w .tbl_frm01 textarea {} /* #bo_w .tbl_frm01 #captcha {} From 8399dafd4b4a0611c91697c8859a0ca3c5e5cdb9 Mon Sep 17 00:00:00 2001 From: thisgun Date: Wed, 21 Nov 2018 15:52:18 +0900 Subject: [PATCH 07/19] =?UTF-8?q?5.3.2.0=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 c7356a38d..4b7987a60 100644 --- a/config.php +++ b/config.php @@ -5,7 +5,7 @@ ********************/ define('G5_VERSION', '그누보드5'); -define('G5_GNUBOARD_VER', '5.3.1.9'); +define('G5_GNUBOARD_VER', '5.3.2.0'); // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음 define('_GNUBOARD_', true); From 918663a7e2d944bfd40956e61ef11d9cac90f8fb Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 26 Nov 2018 15:11:19 +0900 Subject: [PATCH 08/19] =?UTF-8?q?=EB=B4=87=EC=9D=98=20=EB=A9=94=EC=9D=BC?= =?UTF-8?q?=20=EB=A7=81=ED=81=AC=20=ED=81=AC=EB=A1=A4=EB=A7=81=20=EB=B0=A9?= =?UTF-8?q?=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/email_certify.php | 3 +++ bbs/password_lost_certify.php | 3 +++ lib/common.lib.php | 21 +++++++++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/bbs/email_certify.php b/bbs/email_certify.php index 2fc735b32..83465e706 100644 --- a/bbs/email_certify.php +++ b/bbs/email_certify.php @@ -1,6 +1,9 @@ Date: Mon, 26 Nov 2018 15:11:44 +0900 Subject: [PATCH 09/19] =?UTF-8?q?5.3.2.1=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 4b7987a60..802cde66d 100644 --- a/config.php +++ b/config.php @@ -5,7 +5,7 @@ ********************/ define('G5_VERSION', '그누보드5'); -define('G5_GNUBOARD_VER', '5.3.2.0'); +define('G5_GNUBOARD_VER', '5.3.2.1'); // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음 define('_GNUBOARD_', true); From 97ee35e985997a9b9daddf8fb3dde753ef8b47c4 Mon Sep 17 00:00:00 2001 From: thisgun Date: Fri, 7 Dec 2018 10:59:59 +0900 Subject: [PATCH 10/19] =?UTF-8?q?KVE-2018-1316=20=EC=B7=A8=EC=95=BD?= =?UTF-8?q?=EC=A0=90=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 11/19] =?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 12/19] =?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 13/19] =?UTF-8?q?KVE-2018-1808=20=EC=B7=A8=EC=95=BD?= =?UTF-8?q?=EC=A0=90=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 14/19] =?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 15/19] =?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 16/19] =?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); From 061e73c014e4304c8220216487183517bfe13484 Mon Sep 17 00:00:00 2001 From: thisgun Date: Tue, 18 Dec 2018 12:26:12 +0900 Subject: [PATCH 17/19] =?UTF-8?q?KVE-2018-1316=20=EC=B7=A8=EC=95=BD?= =?UTF-8?q?=EC=A0=90=20=EB=8B=A4=EC=8B=9C=20=EC=9E=AC=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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index 2ee0ad6c3..3ecde78c9 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -2885,10 +2885,12 @@ function clean_xss_tags($str) { $str_len = strlen($str); + $i = 0; while($i <= $str_len){ $result = preg_replace('#]*+>#i', '', $str); - if((string)$result === (string)$str) - break; + + if((string)$result === (string)$str) break; + $str = $result; $i++; } From 129da34249c9b6a4e9549d2c797bd4117c6c8c7d Mon Sep 17 00:00:00 2001 From: thisgun Date: Wed, 26 Dec 2018 12:15:48 +0900 Subject: [PATCH 18/19] =?UTF-8?q?iframe=20=ED=97=88=EC=9A=A9=20=EC=A3=BC?= =?UTF-8?q?=EC=86=8C=EC=97=90=20=EC=B9=B4=EC=B9=B4=EC=98=A4=20tv=20?= =?UTF-8?q?=EC=A3=BC=EC=86=8C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/htmlpurifier/safeiframe.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugin/htmlpurifier/safeiframe.txt b/plugin/htmlpurifier/safeiframe.txt index 48c676d4f..ab6d6444f 100644 --- a/plugin/htmlpurifier/safeiframe.txt +++ b/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/ \ No newline at end of file +v.afree.ca/ +play-tv.kakao.com/ \ No newline at end of file From 3efa500b022748681dacde4f25e4560124b7a920 Mon Sep 17 00:00:00 2001 From: thisgun Date: Wed, 26 Dec 2018 15:48:23 +0900 Subject: [PATCH 19/19] =?UTF-8?q?=EC=8D=B8=EB=84=A4=EC=9D=BC=20=EB=9D=BC?= =?UTF-8?q?=EC=9D=B4=EB=B8=8C=EB=9F=AC=EB=A6=AC=20=EC=BD=94=EB=93=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 --- lib/thumbnail.lib.php | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/lib/thumbnail.lib.php b/lib/thumbnail.lib.php index 1665d207a..557384762 100644 --- a/lib/thumbnail.lib.php +++ b/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