harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add peer filtering to all .well-known services

Browse Source
This commit is contained in:
redmatrix 2016-01-28 17:06:13 -08:00
parent 35a9a468ce
commit c214692f66
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
boot.php
View File

@ -863,7 +863,7 @@ class App {
&& array_key_exists('baseurl',$this->config['system']) && array_key_exists('baseurl',$this->config['system'])
&& strlen($this->config['system']['baseurl'])) { && strlen($this->config['system']['baseurl'])) {
$url = $this->config['system']['baseurl']; $url = $this->config['system']['baseurl'];
$url = trim($url,'\\/');
return $url; return $url;
} }
@ -881,6 +881,7 @@ class App {
&& array_key_exists('baseurl',$this->config['system']) && array_key_exists('baseurl',$this->config['system'])
&& strlen($this->config['system']['baseurl'])) { && strlen($this->config['system']['baseurl'])) {
$url = $this->config['system']['baseurl']; $url = $this->config['system']['baseurl'];
$url = trim($url,'\\/');
} }
$parsed = @parse_url($url); $parsed = @parse_url($url);

16
mod/_well_known.php
View File

@ -7,6 +7,22 @@ function _well_known_init(&$a){
$arr = array('server' => $_SERVER, 'request' => $_REQUEST); $arr = array('server' => $_SERVER, 'request' => $_REQUEST);
call_hooks('well_known', $arr); call_hooks('well_known', $arr);
if(! check_siteallowed($_SERVER['REMOTE_ADDR'])) {
logger('well_known: site not allowed. ' . $_SERVER['REMOTE_ADDR']);
killme();
}
// from php.net re: REMOTE_HOST:
// Note: Your web server must be configured to create this variable. For example in Apache
// you'll need HostnameLookups On inside httpd.conf for it to exist. See also gethostbyaddr().
if(get_config('system','siteallowed_remote_host') && (! check_siteallowed($_SERVER['REMOTE_HOST']))) {
logger('well_known: site not allowed. ' . $_SERVER['REMOTE_HOST']);
killme();
}
switch(argv(1)) { switch(argv(1)) {
case 'zot-info': case 'zot-info':
$a->argc -= 1; $a->argc -= 1;