Przeglądaj źródła

Fix: Problem of parsing access_token and handling Authorization header

- Close #227
Sotaro KARASAWA 8 lat temu
rodzic
commit
33d0759e59
2 zmienionych plików z 5 dodań i 1 usunięć
  1. 3 0
      lib/crowi/express-init.js
  2. 2 1
      lib/util/middlewares.js

+ 3 - 0
lib/crowi/express-init.js

@@ -79,6 +79,9 @@ module.exports = function(crowi, app) {
   // Set basic auth middleware
   app.use(function(req, res, next) {
     var config = crowi.getConfig();
+    if (req.query.access_token || req.body.access_token) {
+      return next();
+    }
 
     if (config.crowi['security:basicName'] && config.crowi['security:basicSecret']) {
       return basicAuth(

+ 2 - 1
lib/util/middlewares.js

@@ -189,7 +189,8 @@ exports.loginRequired = function(crowi, app) {
 
 exports.accessTokenParser = function(crowi, app) {
   return function(req, res, next) {
-    var accessToken = req.query.access_token || req.body.access_token || req.get('Authorization') || null;
+    // TODO: comply HTTP header of RFC6750 / Authorization: Bearer
+    var accessToken = req.query.access_token || req.body.access_token || null;
     if (!accessToken) {
       return next();
     }