瀏覽代碼

Fix u2f with nginx rp

andryyy 8 年之前
父節點
當前提交
e2dc15774f
共有 3 個文件被更改,包括 5 次插入5 次删除
  1. 1 2
      data/web/inc/prerequisites.inc.php
  2. 2 3
      data/web/u2f_api.php
  3. 2 0
      docs/first_steps.md

+ 1 - 2
data/web/inc/prerequisites.inc.php

@@ -26,8 +26,7 @@ require_once 'inc/lib/Yubico.php';
 
 // U2F API
 require_once 'inc/lib/U2F.php';
-$scheme = isset($_SERVER['HTTPS']) ? "https://" : "http://";
-$u2f = new u2flib_server\U2F($scheme . $_SERVER['HTTP_HOST']);
+$u2f = new u2flib_server\U2F('https://' . $_SERVER['HTTP_HOST']);
 
 // PDO
 $dsn = "$database_type:host=$database_host;dbname=$database_name";

+ 2 - 3
data/web/u2f_api.php

@@ -3,8 +3,7 @@ require_once('inc/prerequisites.inc.php');
 $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 $pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
 
-$scheme = isset($_SERVER['HTTPS']) ? "https://" : "http://";
-$u2f = new u2flib_server\U2F($scheme . $_SERVER['HTTP_HOST']);
+$u2f = new u2flib_server\U2F('https://' . $_SERVER['HTTP_HOST']);
 
 function getRegs($username) {
   global $pdo;
@@ -154,4 +153,4 @@ Action: <br />
 }
 ?>
 </body>
-</html>
+</html>

+ 2 - 0
docs/first_steps.md

@@ -83,6 +83,7 @@ HTTP_PORT=8080
 HTTPS_PORT=127.0.0.1
 HTTPS_PORT=8443
 ```
+** IMPORTANT: Do not use port 8081 **
 
 Recreate affected containers by running `docker-compose up -d`.
 
@@ -125,6 +126,7 @@ server {
     location / {
         proxy_pass http://127.0.0.1:8080/;
         proxy_redirect http://127.0.0.1:8080/ $scheme://$host:$server_port/;
+        proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;