mirror
/
Enterprise-Onion-Toolkit
kopia lustrzana https://github.com/alecmuffett/eotk
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

commit: slightly nicer generated code

pull/66/head
Alec Muffett 2020-06-05 10:37:34 +00:00
rodzic f2569d9ede
commit e1f77730a6
2 zmienionych plików z 6 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
lib.d/generate-bw-code.pl
Wyświetl plik

@ -11,6 +11,8 @@ $indent = " ";
@white = ();
@tail = ();
$dont_onion = "set \$dont_onionify_response_headers 1; # dest URL must not be rewritten, prevent loops; cookies may migrate.";
sub blackwhite {
my ($operator, $lc_what, $a, $b) = @_;
my $uc_what = uc($lc_what);
@ -90,7 +92,7 @@ while (<DATA>) {
push(@redirect, "# redirect $lc_what: 1=regexp,2=code,3=dest (REQUEST_URI will be appended) $warning\n");
push(@redirect, "%%CSV %$uc_what%\n");
push(@redirect, "$condition {\n");
push(@redirect, " set \$dont_onionify_response_headers 1;\n") if ($uc_what =~ /_HOST/); # this is a horrible kludge
push(@redirect, " $dont_onion\n") if ($uc_what =~ /_HOST/); # this is a horrible kludge
push(@redirect, " return %2% %3%\$request_uri;\n");
push(@redirect, "}\n");
push(@redirect, "%%ENDCSV\n");
@ -104,7 +106,7 @@ while (<DATA>) {
push(@redirect, "# fixed_redirect $lc_what: 1=regexp,2=code,3=dest (REQUEST_URI will NOT be appended) $warning\n");
push(@redirect, "%%CSV %$uc_what%\n");
push(@redirect, "$condition {\n");
push(@redirect, " set \$dont_onionify_response_headers 1;\n") if ($uc_what =~ /_HOST/); # this is a horrible kludge
push(@redirect, " $dont_onion\n") if ($uc_what =~ /_HOST/); # this is a horrible kludge
push(@redirect, " return %2% %3%;\n");
push(@redirect, "}\n");
push(@redirect, "%%ENDCSV\n");

4
templates.d/nginx-generated-blocks.conf
Wyświetl plik

@ -225,7 +225,7 @@
# redirect redirect_host: 1=regexp,2=code,3=dest (REQUEST_URI will be appended) (generated)
%%CSV %REDIRECT_HOST%
if ( $host ~* "%1%" ) {
set $dont_onionify_response_headers 1;
set $dont_onionify_response_headers 1; # dest URL must not be rewritten, prevent loops; cookies may migrate.
return %2% %3%$request_uri;
}
%%ENDCSV
@ -246,7 +246,7 @@
# fixed_redirect redirect_fixed_host: 1=regexp,2=code,3=dest (REQUEST_URI will NOT be appended) (generated)
%%CSV %REDIRECT_FIXED_HOST%
if ( $host ~* "%1%" ) {
set $dont_onionify_response_headers 1;
set $dont_onionify_response_headers 1; # dest URL must not be rewritten, prevent loops; cookies may migrate.
return %2% %3%;
}
%%ENDCSV