FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-28 11:01:59 +00:00
Code Issues Releases Wiki Activity

Cors fixes by gaggi

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@1871 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2012-09-19 07:46:28 +00:00
parent 9a98c839b9
commit 4ddbb2333b
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fhem/FHEM/01_FHEMWEB.pm
View File

@ -237,28 +237,46 @@ FW_Read($)
@FW_httpheader = split("[\r\n]", $hash->{BUF});
my @origin = grep /Origin/, @FW_httpheader;
my $headercors = ($FW_cors ? "Access-Control-Allow-".$origin[0]."\r\n".
"Access-Control-Allow-Methods: GET, POST, OPTIONS\r\n".
"Access-Control-Allow-Headers: Origin, Authorization, Accept\r\n".
"Access-Control-Allow-Credentials: true\r\n".
"Access-Control-Max-Age:86400\r\n" : "");
#############################
# BASIC HTTP AUTH
my $basicAuth = AttrVal($FW_wname, "basicAuth", undef);
my @headerOptions = grep /OPTIONS/, @FW_httpheader;
if($basicAuth) {
$hash->{BUF} =~ m/Authorization: Basic ([^\r\n]*)/s;
my $secret = $1;
my $pwok = ($secret && $secret eq $basicAuth);
if($secret && $basicAuth =~ m/^{.*}$/) {
if($secret && $basicAuth =~ m/^{.*}$/ || $headerOptions[0]) {
eval "use MIME::Base64";
if($@) {
Log 1, $@;
} else {
} else {
my ($user, $password) = split(":", decode_base64($secret));
$pwok = eval $basicAuth;
Log 1, "basicAuth expression: $@" if($@);
}
}
if($headerOptions[0]) {
print $c "HTTP/1.1 200 OK\r\n",
$headercors,
"Content-Length: 0\r\n\r\n";
$hash->{BUF}="";
return;
exit(1);
};
if(!$pwok) {
my $msg = AttrVal($FW_wname, "basicAuthMsg", "Fhem: login required");
print $c "HTTP/1.1 401 Authorization Required\r\n",
"WWW-Authenticate: Basic realm=\"$msg\"\r\n",
$headercors,
"Content-Length: 0\r\n\r\n";
$hash->{BUF}="";
return;
@ -281,8 +299,6 @@ FW_Read($)
my $cacheable = FW_AnswerCall($arg);
return if($cacheable == -1); # Longpoll / inform request;
my $headercors = ($FW_cors ? "Access-Control-Allow-Origin: *\r\n" : "");
my $compressed = "";
if(($FW_RETTYPE =~ m/text/i ||
$FW_RETTYPE =~ m/svg/i ||
@ -470,12 +486,20 @@ FW_AnswerCall($)
$FW_cmdret = $docmd ? FW_fC($cmd) : "";
my @origin = grep /Origin/, @FW_httpheader;
my $headercors = ($FW_cors ? "Access-Control-Allow-".$origin[0]."\r\n".
"Access-Control-Allow-Methods: GET, POST, OPTIONS\r\n".
"Access-Control-Allow-Headers: Origin, Authorization, Accept\r\n".
"Access-Control-Allow-Credentials: true\r\n".
"Access-Control-Max-Age:86400\r\n" : "");
if($FW_inform) { # Longpoll header
$me->{inform} = ($FW_room ? $FW_room : $FW_inform);
# NTFY_ORDER is larger than the normal order (50-)
$me->{NTFY_ORDER} = $FW_cname; # else notifyfn won't be called
my $c = $me->{CD};
print $c "HTTP/1.1 200 OK\r\n",
$headercors,
"Content-Type: text/plain; charset=$FW_encoding\r\n\r\n";
return -1;
}