From 0d8e784d4a881dc71ad9c00de939716a9974a0fc Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Wed, 1 Mar 2017 12:05:12 +0000 Subject: [PATCH] 01_FHEMWEB.pm: change return code for bad csrf from 401 to 400 (Forum #67848) git-svn-id: https://svn.fhem.de/fhem/trunk@13563 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/01_FHEMWEB.pm | 2 +- fhem/www/pgm2/fhemdoc_modular.js | 2 +- fhem/www/pgm2/fhemweb.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm index 62860892e..657ebe0d2 100755 --- a/fhem/FHEM/01_FHEMWEB.pm +++ b/fhem/FHEM/01_FHEMWEB.pm @@ -817,7 +817,7 @@ FW_answerCall($) if($supplied ne $want) { Log3 $FW_wname, 3, "FHEMWEB $FW_wname CSRF error: $supplied ne $want. ". "For detals see the csrfToken FHEMWEB attribute"; - $FW_httpRetCode = "401 Unauthorized"; + $FW_httpRetCode = "400 Bad Request"; return 0; } } diff --git a/fhem/www/pgm2/fhemdoc_modular.js b/fhem/www/pgm2/fhemdoc_modular.js index 64b620d63..19bee9718 100644 --- a/fhem/www/pgm2/fhemdoc_modular.js +++ b/fhem/www/pgm2/fhemdoc_modular.js @@ -25,7 +25,7 @@ fd_fC(fn, callback) $.ajax({ url:cmd, method:'POST', cache:false, success:callback, error:function(xhr, status, err) { - if(xhr.status == 401 && csrfToken) { + if(xhr.status == 400 && csrfToken) { csrfToken = ""; fd_csrfRefresh(function(){fd_fC(fn, callback)}); } else { diff --git a/fhem/www/pgm2/fhemweb.js b/fhem/www/pgm2/fhemweb.js index 5f16fa0f2..9899d9356 100644 --- a/fhem/www/pgm2/fhemweb.js +++ b/fhem/www/pgm2/fhemweb.js @@ -406,7 +406,7 @@ FW_cmd(arg, callback) FW_errmsg(req.responseText, 5000); }, error:function(xhr, status, err) { - if(xhr.status == 401 && typeof FW_csrfToken != "undefined") { + if(xhr.status == 400 && typeof FW_csrfToken != "undefined") { FW_csrfToken = ""; FW_csrfRefresh(function(){FW_cmd(arg, callback)}); } @@ -759,7 +759,7 @@ FW_doUpdate(evt) } else { if(FW_pollConn.readyState == 4 && !FW_leaving) { - if(FW_pollConn.status == "401") { + if(FW_pollConn.status == "400") { location.reload(); return; }