Procházet zdrojové kódy

Traefik return with redirect

HalianElf před 5 roky
rodič
revize
3abfd103ca
2 změnil soubory, kde provedl 8 přidání a 2 odebrání
  1. 2 1
      .gitignore
  2. 6 1
      api/classes/organizr.class.php

+ 2 - 1
.gitignore

@@ -167,4 +167,5 @@ api/pages/custom/*.php
 /plugins/images/cache/tautulli-artist.svg
 /plugins/images/cache/tautulli-artist.svg
 /plugins/images/cache/tautulli-movie.svg
 /plugins/images/cache/tautulli-movie.svg
 /plugins/images/cache/tautulli-windows.svg
 /plugins/images/cache/tautulli-windows.svg
-plugins/images/cache/tautulli-samsung.svg
+/plugins/images/cache/tautulli-samsung.svg
+/plugins/images/cache/tautulli-chrome.svg

+ 6 - 1
api/classes/organizr.class.php

@@ -217,7 +217,12 @@ class Organizr
 			}
 			}
 			if ($group !== null) {
 			if ($group !== null) {
 				if ((isset($_SERVER['HTTP_X_FORWARDED_SERVER']) && $_SERVER['HTTP_X_FORWARDED_SERVER'] == 'traefik') || $this->config['traefikAuthEnable']) {
 				if ((isset($_SERVER['HTTP_X_FORWARDED_SERVER']) && $_SERVER['HTTP_X_FORWARDED_SERVER'] == 'traefik') || $this->config['traefikAuthEnable']) {
-					$redirect = 'Location: ' . $this->getServerPath();
+					if (isset($_SERVER['HTTP_X_FORWARDED_HOST']) && isset($_SERVER['HTTP_X_FORWARDED_URI']) && isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
+						$return = '?return=' . $_SERVER['HTTP_X_FORWARDED_PROTO'] . '://' . $_SERVER['HTTP_X_FORWARDED_HOST'] . $_SERVER['HTTP_X_FORWARDED_URI'];
+					} else {
+						$return = '';
+					}
+					$redirect = 'Location: ' . $this->getServerPath() . $return;
 				}
 				}
 				if ($this->qualifyRequest($group) && $unlocked) {
 				if ($this->qualifyRequest($group) && $unlocked) {
 					header("X-Organizr-User: $currentUser");
 					header("X-Organizr-User: $currentUser");