mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-04-21 07:56:16 -04:00
Merge pull request #1787 from goldquest/dev_nopass_whensession
Grant access for valid session to password protected group pads so, if user has valid session, they don't need the password
This commit is contained in:
commit
b1b972a2b4
3 changed files with 14 additions and 0 deletions
|
@ -59,6 +59,9 @@
|
||||||
|
|
||||||
/* Users may edit pads but not create new ones. Pad creation is only via the API. This applies both to group pads and regular pads. */
|
/* Users may edit pads but not create new ones. Pad creation is only via the API. This applies both to group pads and regular pads. */
|
||||||
"editOnly" : false,
|
"editOnly" : false,
|
||||||
|
|
||||||
|
/* Users, who have a valid session, automatically get granted access to password protected pads */
|
||||||
|
"sessionNoPassword" : false,
|
||||||
|
|
||||||
/* if true, all css & js will be minified before sending to the client. This will improve the loading performance massivly,
|
/* if true, all css & js will be minified before sending to the client. This will improve the loading performance massivly,
|
||||||
but makes it impossible to debug the javascript/css */
|
but makes it impossible to debug the javascript/css */
|
||||||
|
|
|
@ -223,6 +223,12 @@ exports.checkAccess = function (padID, sessionCookie, token, password, callback)
|
||||||
//--> grant access
|
//--> grant access
|
||||||
statusObject = {accessStatus: "grant", authorID: sessionAuthor};
|
statusObject = {accessStatus: "grant", authorID: sessionAuthor};
|
||||||
}
|
}
|
||||||
|
//- the setting to bypass password validation is set
|
||||||
|
else if(settings.sessionNoPassword)
|
||||||
|
{
|
||||||
|
//--> grant access
|
||||||
|
statusObject = {accessStatus: "grant", authorID: sessionAuthor};
|
||||||
|
}
|
||||||
//- the pad is password protected and password is correct
|
//- the pad is password protected and password is correct
|
||||||
else if(isPasswordProtected && passwordStatus == "correct")
|
else if(isPasswordProtected && passwordStatus == "correct")
|
||||||
{
|
{
|
||||||
|
|
|
@ -109,6 +109,11 @@ exports.requireSession = false;
|
||||||
*/
|
*/
|
||||||
exports.editOnly = false;
|
exports.editOnly = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A flag that bypasses password prompts for users with valid sessions
|
||||||
|
*/
|
||||||
|
exports.sessionNoPassword = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Max age that responses will have (affects caching layer).
|
* Max age that responses will have (affects caching layer).
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue