Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-09-07 11:28:25 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add SSL support (not yet usable)

Browse Source
This commit is contained in:
Cathy J. Fitzpatrick
2013-05-01 05:50:46 -07:00
parent 33b9501b53
commit af992bd86a
5 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.htaccess
View File

@@ -23,6 +23,10 @@ RewriteEngine on
RewriteCond %{HTTP_HOST} ^www\.play\.pokemonshowdown\.com$ [NC]
RewriteRule ^(.*) http://play.pokemonshowdown.com/$1 [R=301,L]
#RewriteCond %{HTTP:X-Forwarded-Proto} ^http$
#RewriteCond %{REMOTE_ADDR} !^69\.85\.87\.173$
#RewriteRule ^(.*) https://play.pokemonshowdown.com/$1 [R=301,L]
RewriteRule ^style/font/.*?\.(eot|svg|ttf|woff)$ - [E=SAFE_RESOURCE]
Header set Access-Control-Allow-Origin * env=SAFE_RESOURCE

1
crossdomain.php
View File

@@ -9,6 +9,7 @@ if (preg_match('/^([a-z0-9-_\.]*?)\.dev\.psim\.us$/', $host, $m)) {
} else if (preg_match('/^([a-z0-9-_\.]*?)\.psim\.us$/', $host, $m)) {
$config['host'] = $m[1];
if ($config['host'] === 'logs') die; // not authorised
if ($config['host'] === 'sim') die; // not authorised
} else if ($host === 'dev.pokemonshowdown.com') {
$config['host'] = 'dev';
} else {

3
customcss.php
View File

@@ -13,7 +13,8 @@ header('Content-Type: text/css'); // the CSS file should specify a charset
$serverdata =& $PokemonServers[$server];
$customcssuri = @$serverdata['customcss'];
if (empty($customcssuri)) {
$customcssuri = 'http://'.$serverdata['server'].':'.$serverdata['port'].'/custom.css';
$protocol = ($serverdata['port'] === 443) ? 'https' : 'http';
$customcssuri = $protocol . '://'.$serverdata['server'].':'.$serverdata['port'].'/custom.css';
}
// No need to sanitise $server because it should be safe already.

3
js/battledata.js
View File

@@ -344,7 +344,8 @@ var Tools = {
}
if (window.Config && Config.server && Config.server.registered) {
// custom avatar served by the server
return 'http://' + Config.server.host + ':' + Config.server.port +
var protocol = (Config.server.port === 443) ? 'https' : 'http';
return protocol + '://' + Config.server.host + ':' + Config.server.port +
'/avatars/' + encodeURIComponent(avatar);
}
// just pick a random avatar

8
js/sim.js
View File

@@ -1,7 +1,7 @@
// some setting-like stuff
Config.defaultserver = {
id: 'showdown',
host: 'sim.smogon.com',
host: 'sim.psim.us',
port: 8000,
altport: 80,
registered: true
@@ -3572,7 +3572,8 @@ teams = (function() {
}
var constructSocket = function() {
return new SockJS('http://' + Config.server.host + ':' +
var protocol = (Config.server.port === 443) ? 'https' : 'http';
return new SockJS(protocol + '://' + Config.server.host + ':' +
Config.server.port + Config.sockjsprefix);
};
@@ -3769,6 +3770,9 @@ teams = (function() {
};
var origindomain = 'play.pokemonshowdown.com';
if ((document.location.hostname === origindomain) || Config.testclient) {
if ((document.location.protocol === 'https:') && !Tools.prefs('portedstorage')) {
return document.location.replace('http://' + document.location.hostname + document.location.pathname);
}
if (!Config.testclient) {
Config.server = Config.defaultserver;
}