浏览代码

Fixes U2F, fixes #231

andryyy 8 年之前
父节点
当前提交
ea77f60dae
共有 2 个文件被更改,包括 4 次插入2 次删除
  1. 2 2
      data/web/inc/footer.inc.php
  2. 2 0
      data/web/json_api.php

+ 2 - 2
data/web/inc/footer.inc.php

@@ -67,7 +67,7 @@ $(document).ready(function() {
           type: "GET",
           cache: false,
           dataType: 'script',
-          url: "/api/v1/u2f-authentication/<?=(isset($_SESSION['pending_mailcow_cc_username'])) ? $_SESSION['pending_mailcow_cc_username'] : null;?>",
+          url: "/api/v1/get/u2f-authentication/<?=(isset($_SESSION['pending_mailcow_cc_username'])) ? $_SESSION['pending_mailcow_cc_username'] : null;?>",
           success: function(data){
             data;
           }
@@ -100,7 +100,7 @@ $(document).ready(function() {
         type: "GET",
         cache: false,
         dataType: 'script',
-        url: "/api/v1/u2f-registration/<?=(isset($_SESSION['mailcow_cc_username'])) ? $_SESSION['mailcow_cc_username'] : null;?>",
+        url: "/api/v1/get/u2f-registration/<?=(isset($_SESSION['mailcow_cc_username'])) ? $_SESSION['mailcow_cc_username'] : null;?>",
         success: function(data){
           data;
         }

+ 2 - 0
data/web/json_api.php

@@ -235,6 +235,7 @@ if (isset($_SESSION['mailcow_cc_role']) || isset($_SESSION['pending_mailcow_cc_u
             }
           break;
           case "u2f-registration":
+            header('Content-Type: application/javascript');
             if (($_SESSION["mailcow_cc_role"] == "admin" || $_SESSION["mailcow_cc_role"] == "domainadmin") && $_SESSION["mailcow_cc_username"] == $object) {
               $data = $u2f->getRegisterData(get_u2f_registrations($object));
               list($req, $sigs) = $data;
@@ -246,6 +247,7 @@ if (isset($_SESSION['mailcow_cc_role']) || isset($_SESSION['pending_mailcow_cc_u
             }
           break;
           case "u2f-authentication":
+            header('Content-Type: application/javascript');
             if (isset($_SESSION['pending_mailcow_cc_username']) && $_SESSION['pending_mailcow_cc_username'] == $object) {
               $reqs = json_encode($u2f->getAuthenticateData(get_u2f_registrations($object)));
               $_SESSION['authReq']  = $reqs;