Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-19 16:15:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fuck Apache

Browse source
This commit is contained in:
Mike Macgirvin 2023-06-11 10:34:36 +10:00
parent fc40564cb0
commit 9dd0ecd8a4
6 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Code/Module/Cdav.php
View file

@ -56,6 +56,14 @@ class Cdav extends Controller
}
if ((argv(1) !== 'calendar') && (argv(1) !== 'addressbook')) {
if (isset($_SERVER['HTTP_SIGNATURE']) &&
!isset($_SERVER['REDIRECT_REMOTE_USER']) &&
!isset($_SERVER['HTTP_AUTHORIZATION'])) {
$_SERVER['HTTP_AUTHORIZATION'] = 'Signature ' . $_SERVER['HTTP_SIGNATURE'];
}
foreach (['REDIRECT_REMOTE_USER', 'HTTP_AUTHORIZATION'] as $head) {
/* Basic authentication */

5
Code/Module/Dav.php
View file

@ -36,6 +36,11 @@ class Dav extends Controller
*/
public function init()
{
if (isset($_SERVER['HTTP_SIGNATURE']) &&
!isset($_SERVER['REDIRECT_REMOTE_USER']) &&
!isset($_SERVER['HTTP_AUTHORIZATION'])) {
$_SERVER['HTTP_AUTHORIZATION'] = 'Signature ' . $_SERVER['HTTP_SIGNATURE'];
}
foreach (['REDIRECT_REMOTE_USER', 'HTTP_AUTHORIZATION'] as $head) {
/* Basic authentication */

7
Code/Module/Getfile.php
View file

@ -56,6 +56,13 @@ class Getfile extends Controller
killme();
}
if (isset($_SERVER['HTTP_SIGNATURE']) &&
!isset($_SERVER['REDIRECT_REMOTE_USER']) &&
!isset($_SERVER['HTTP_AUTHORIZATION'])) {
$_SERVER['HTTP_AUTHORIZATION'] = 'Signature ' . $_SERVER['HTTP_SIGNATURE'];
}
foreach (['REDIRECT_REMOTE_USER', 'HTTP_AUTHORIZATION'] as $head) {
if (array_key_exists($head, $_SERVER) && str_starts_with(trim($_SERVER[$head]), 'Signature')) {
if ($head !== 'HTTP_AUTHORIZATION') {

4
Code/Module/Owa.php
View file

@ -20,13 +20,15 @@ class Owa extends Controller
public function init()
{
$ret = ['success' => false];
if (array_key_exists('REDIRECT_REMOTE_USER', $_SERVER) && (!array_key_exists('HTTP_AUTHORIZATION', $_SERVER))) {
$_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['REDIRECT_REMOTE_USER'];
}
if (array_key_exists('HTTP_SIGNATURE', $_SERVER) && (!array_key_exists('HTTP_AUTHORIZATION', $_SERVER))) {
$_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['HTTP_SIGNATURE'];
}
if (array_key_exists('HTTP_AUTHORIZATION', $_SERVER) && str_starts_with(trim($_SERVER['HTTP_AUTHORIZATION']), 'Signature')) {
$sigblock = HTTPSig::parse_sigheader($_SERVER['HTTP_AUTHORIZATION']);

10
Code/Web/HTTPSig.php
View file

@ -562,11 +562,12 @@ class HTTPSig
}
}
$authorisation = '';
if ($auth) {
$sighead = 'Authorization: Signature ' . $headerval;
} else {
$sighead = 'Signature: ' . $headerval;
$authorisation = 'Authorization: Signature ' . $headerval;
}
$sighead = 'Signature: ' . $headerval;
if ($head) {
foreach ($head as $k => $v) {
@ -578,6 +579,9 @@ class HTTPSig
}
}
$return_headers[] = $sighead;
if ($authorisation) {
$return_headers[] = $authorisation;
}
return $return_headers;
}

1
htaccess.dist
View file

@ -1,6 +1,7 @@
Options -Indexes
AddType application/x-java-archive .jar
AddType audio/ogg .oga
CGIPassAuth On
#SSLCipherSuite HIGH:AES256-SHA:AES128-SHA:RC4:!aNULL:!eNULL:!EDH
# don't allow any web access to logfiles, even after rotation/compression