mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-09-07 00:17:03 +03:00
Merge pull request #1597 from PhilippMundhenk/master
[ProxyAuth plugin] password as SensitiveString & support for subdirectories
This commit is contained in:
commit
aa91623d35
2 changed files with 3 additions and 3 deletions
|
|
@ -118,7 +118,7 @@ class ProxyAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
|
||||||
if ($sProxyRequest) {
|
if ($sProxyRequest) {
|
||||||
/* create master user login from remote user header and settings */
|
/* create master user login from remote user header and settings */
|
||||||
$sEmail = $sRemoteUser . $sMasterSeparator . $sMasterUser;
|
$sEmail = $sRemoteUser . $sMasterSeparator . $sMasterUser;
|
||||||
$sPassword = \trim($this->Config()->getDecrypted('plugin', 'master_password', ''));
|
$sPassword = new \SnappyMail\SensitiveString(\trim($this->Config()->getDecrypted('plugin', 'master_password', '')));
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -11,11 +11,11 @@
|
||||||
ForwardProxyAuth = () => {
|
ForwardProxyAuth = () => {
|
||||||
if (auto_login) {
|
if (auto_login) {
|
||||||
var xhr = new XMLHttpRequest();
|
var xhr = new XMLHttpRequest();
|
||||||
xhr.open("GET", "/?UserHeaderSet", true);
|
xhr.open("GET", "?UserHeaderSet", true);
|
||||||
|
|
||||||
xhr.onreadystatechange = function () {
|
xhr.onreadystatechange = function () {
|
||||||
if (xhr.readyState == 4 && xhr.status == 200) {
|
if (xhr.readyState == 4 && xhr.status == 200) {
|
||||||
window.location.href = "/?ProxyAuth";
|
window.location.href = "?ProxyAuth";
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue