fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-05 17:51:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Support HTTPS connection

Browse source 
Support HTTPS connection from server to server and server to cilent.
다양한 환경에서 적용하기 위해서 SSL 호스트 검증은 하지 못할듯 합니다. -- curl 이라면 가능하다고는 하는데..
This commit is contained in:
MinSoo Kim 2015-12-31 22:43:12 +09:00
parent c58b5bf4bf
commit b8fd20bbae
8 changed files with 46 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/package.inc.php
View file

@ -3,5 +3,5 @@
define('_XE_PACKAGE_', 'XE'); define('_XE_PACKAGE_', 'XE');
define('_XE_LOCATION_', 'ko'); define('_XE_LOCATION_', 'ko');
define('_XE_LOCATION_SITE_', 'http://www.xpressengine.com/'); define('_XE_LOCATION_SITE_', 'https://www.xpressengine.com/');
define('_XE_DOWNLOAD_SERVER_', 'http://download.xpressengine.com/'); define('_XE_DOWNLOAD_SERVER_', 'https://download.xpressengine.com/');

2
libs/PEAR.1.9.5/HTTP/Request.php
View file

@ -27,7 +27,7 @@ class HTTP_Request extends HTTP_Request2
public function getResponseHeader() { public function getResponseHeader() {
if($this->response) if($this->response)
{ {
return $this->response->getHeader(); return $this->response->getHeader();
} }
} }

2
libs/ftp.class.php
View file

@ -53,7 +53,7 @@
var $ftp_resp; var $ftp_resp;
/* Constractor */ /* Constractor */
function ftp() function __construct()
{ {
$this->debug = false; $this->debug = false;
$this->umask = 0022; $this->umask = 0022;

2
libs/tar.class.php
View file

@ -76,7 +76,7 @@ class tar {
// Class Constructor -- Does nothing... // Class Constructor -- Does nothing...
function tar() { function __construct() {
return true; return true;
} }

6
modules/autoinstall/autoinstall.admin.controller.php
View file

@ -71,7 +71,11 @@ class autoinstallAdminController extends autoinstall
$params["act"] = "getResourceapiUpdate"; $params["act"] = "getResourceapiUpdate";
$body = XmlGenerater::generate($params); $body = XmlGenerater::generate($params);
$buff = FileHandler::getRemoteResource(_XE_DOWNLOAD_SERVER_, $body, 3, "POST", "application/xml"); $request_config = array(
'ssl_verify_peer' => FALSE,
'ssl_verify_host' => FALSE
);
$buff = FileHandler::getRemoteResource(_XE_DOWNLOAD_SERVER_, $body, 3, "POST", "application/xml", array(), array(), array(), $request_config);
$xml = new XmlParser(); $xml = new XmlParser();
$xmlDoc = $xml->parse($buff); $xmlDoc = $xml->parse($buff);
$this->updateCategory($xmlDoc); $this->updateCategory($xmlDoc);

18
modules/autoinstall/autoinstall.admin.view.php
View file

@ -310,7 +310,11 @@ class autoinstallAdminView extends autoinstall
$params["act"] = "getResourceapiPackages"; $params["act"] = "getResourceapiPackages";
$params["package_srls"] = implode(",", array_keys($package_list)); $params["package_srls"] = implode(",", array_keys($package_list));
$body = XmlGenerater::generate($params); $body = XmlGenerater::generate($params);
$buff = FileHandler::getRemoteResource(_XE_DOWNLOAD_SERVER_, $body, 3, "POST", "application/xml"); $request_config = array(
'ssl_verify_peer' => FALSE,
'ssl_verify_host' => FALSE
);
$buff = FileHandler::getRemoteResource(_XE_DOWNLOAD_SERVER_, $body, 3, "POST", "application/xml", array(), array(), array(), $request_config);
$xml_lUpdate = new XmlParser(); $xml_lUpdate = new XmlParser();
$xmlDoc = $xml_lUpdate->parse($buff); $xmlDoc = $xml_lUpdate->parse($buff);
if($xmlDoc && $xmlDoc->response->packagelist->item) if($xmlDoc && $xmlDoc->response->packagelist->item)
@ -401,7 +405,11 @@ class autoinstallAdminView extends autoinstall
$params = array(); $params = array();
$params["act"] = "getResourceapiLastupdate"; $params["act"] = "getResourceapiLastupdate";
$body = XmlGenerater::generate($params); $body = XmlGenerater::generate($params);
$buff = FileHandler::getRemoteResource(_XE_DOWNLOAD_SERVER_, $body, 3, "POST", "application/xml"); $request_config = array(
'ssl_verify_peer' => FALSE,
'ssl_verify_host' => FALSE
);
$buff = FileHandler::getRemoteResource(_XE_DOWNLOAD_SERVER_, $body, 3, "POST", "application/xml", array(), array(), array(), $request_config);
$xml_lUpdate = new XmlParser(); $xml_lUpdate = new XmlParser();
$lUpdateDoc = $xml_lUpdate->parse($buff); $lUpdateDoc = $xml_lUpdate->parse($buff);
$updateDate = $lUpdateDoc->response->updatedate->body; $updateDate = $lUpdateDoc->response->updatedate->body;
@ -547,7 +555,11 @@ class autoinstallAdminView extends autoinstall
$params["act"] = "getResourceapiPackages"; $params["act"] = "getResourceapiPackages";
$params["package_srls"] = $package_srl; $params["package_srls"] = $package_srl;
$body = XmlGenerater::generate($params); $body = XmlGenerater::generate($params);
$buff = FileHandler::getRemoteResource(_XE_DOWNLOAD_SERVER_, $body, 3, "POST", "application/xml"); $request_config = array(
'ssl_verify_peer' => FALSE,
'ssl_verify_host' => FALSE
);
$buff = FileHandler::getRemoteResource(_XE_DOWNLOAD_SERVER_, $body, 3, "POST", "application/xml", array(), array(), array(), $request_config);
$xml_lUpdate = new XmlParser(); $xml_lUpdate = new XmlParser();
$xmlDoc = $xml_lUpdate->parse($buff); $xmlDoc = $xml_lUpdate->parse($buff);
if($xmlDoc && $xmlDoc->response->packagelist->item) if($xmlDoc && $xmlDoc->response->packagelist->item)

17
modules/autoinstall/autoinstall.class.php
View file

@ -40,7 +40,11 @@ class XmlGenerater
function getXmlDoc(&$params) function getXmlDoc(&$params)
{ {
$body = XmlGenerater::generate($params); $body = XmlGenerater::generate($params);
$buff = FileHandler::getRemoteResource(_XE_DOWNLOAD_SERVER_, $body, 3, "POST", "application/xml"); $request_config = array(
'ssl_verify_peer' => FALSE,
'ssl_verify_host' => FALSE
);
$buff = FileHandler::getRemoteResource(_XE_DOWNLOAD_SERVER_, $body, 3, "POST", "application/xml", array(), array(), array(), $request_config);
if(!$buff) if(!$buff)
{ {
return; return;
@ -133,6 +137,11 @@ class autoinstall extends ModuleObject
return TRUE; return TRUE;
} }
// 2015.12.31 replace HTTP connection to HTTPS connection.
if($config->downloadServer !== _XE_DOWNLOAD_SERVER_)
{
return TRUE;
}
return FALSE; return FALSE;
} }
@ -179,6 +188,12 @@ class autoinstall extends ModuleObject
$oDB->addColumn('autoinstall_packages', 'have_instance', 'char', '1', 'N', TRUE); $oDB->addColumn('autoinstall_packages', 'have_instance', 'char', '1', 'N', TRUE);
} }
// 2015.12.31 replace HTTP connection to HTTPS connection.
if($config->downloadServer !== _XE_DOWNLOAD_SERVER_)
{
$config->downloadServer = _XE_DOWNLOAD_SERVER_;
$oModuleController->insertModuleConfig('autoinstall', $config);
}
return new Object(0, 'success_updated'); return new Object(0, 'success_updated');
} }

6
modules/autoinstall/autoinstall.lib.php
View file

@ -136,7 +136,11 @@ class ModuleInstaller
$postdata["path"] = $this->package->path; $postdata["path"] = $this->package->path;
$postdata["module"] = "resourceapi"; $postdata["module"] = "resourceapi";
$postdata["act"] = "procResourceapiDownload"; $postdata["act"] = "procResourceapiDownload";
$buff = FileHandler::getRemoteResource($this->base_url, NULL, 3, "POST", "application/x-www-form-urlencoded", array(), array(), $postdata); $request_config = array(
'ssl_verify_peer' => FALSE,
'ssl_verify_host' => FALSE
);
$buff = FileHandler::getRemoteResource($this->base_url, NULL, 3, "POST", "application/x-www-form-urlencoded", array(), array(), $postdata, $request_config);
FileHandler::writeFile($this->download_file, $buff); FileHandler::writeFile($this->download_file, $buff);
} }