diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rwxr-xr-x | build/autoloaderchecker.sh | 28 | ||||
| -rw-r--r-- | lib/private/User/Session.php | 14 |
3 files changed, 25 insertions, 19 deletions
diff --git a/.gitignore b/.gitignore index 680bd19c8ee..0ca890c26b4 100644 --- a/.gitignore +++ b/.gitignore @@ -155,3 +155,5 @@ clover.xml # Tests - dependencies tests/acceptance/composer.lock tests/acceptance/vendor/ + +composer.phar diff --git a/build/autoloaderchecker.sh b/build/autoloaderchecker.sh index ffa157f6c80..1aa880684f9 100755 --- a/build/autoloaderchecker.sh +++ b/build/autoloaderchecker.sh @@ -1,26 +1,18 @@ #!/usr/bin/env bash -COMPOSER_COMMAND=$(which "composer") -if [ "$COMPOSER_COMMAND" = '' ] +COMPOSER_COMMAND="php composer.phar" + +if [ -e "composer.phar" ] then - #No global composer found, try local or download it - if [ -e "composer.phar" ] - then - echo "Composer found: checking for update" - else - echo "Composer not found: fetching" - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" - php composer-setup.php - php -r "unlink('composer-setup.php');" - fi - - COMPOSER_COMMAND="php composer.phar" + echo "Composer found: checking for update" + $COMPOSER_COMMAND self-update else - echo "Global composer found: checking for update" + echo "Composer not found: fetching" + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" + php composer-setup.php --1 + php -r "unlink('composer-setup.php');" fi -#Make sure we are on the latest composer -$COMPOSER_COMMAND self-update REPODIR=`git rev-parse --show-toplevel` @@ -50,6 +42,8 @@ do fi done +rm composer.phar + echo if [ $composerfile = true ] then diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php index a107f5ce004..71830cd1bbf 100644 --- a/lib/private/User/Session.php +++ b/lib/private/User/Session.php @@ -825,8 +825,18 @@ class Session implements IUserSession, Emitter { return false; } - // Set the session variable so we know this is an app password - $this->session->set('app_password', $token); + try { + $dbToken = $this->tokenProvider->getToken($token); + } catch (InvalidTokenException $e) { + // Can't really happen but better save than sorry + return true; + } + + // Remember me tokens are not app_passwords + if ($dbToken->getRemember() === IToken::DO_NOT_REMEMBER) { + // Set the session variable so we know this is an app password + $this->session->set('app_password', $token); + } return true; } |