[stable25] Add fallback routines for empty secret cases #35605
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
CarlSchwan
requested review from
a team,
ArtificialOwl,
icewind1991 and
come-nc
and removed request for
a team
9 tasks
3 tasks
szaimen
added
4. to release
come-nc
reviewed
Dec 5, 2022
| $this->cache[$token->getToken()] = $token; | ||
| $this->rotate($token, $tokenId, $tokenId); | ||
| } catch (DoesNotExistException $ex2) { | ||
| $this->cache[$tokenHash] = $ex2; |
There was a problem hiding this comment.
Suggested change
| $this->cache[$tokenHash] = $ex2; | |
| $this->cache[$tokenHash] = $ex; |
There was a problem hiding this comment.
non-critical, ignoring for now for the approaching release
can be addressed afterwards
|
/rebase |
|
since this partly affects external storages, let's rerun the tests once now that #35606 is merged |
1 task
Signed-off-by: Julius Härtl <jus@bitgrid.net> (cherry picked from commit 81f8719)
Signed-off-by: Julius Härtl <jus@bitgrid.net> (cherry picked from commit 553cb49)
Signed-off-by: Julius Härtl <jus@bitgrid.net> (cherry picked from commit a6796b4)
Signed-off-by: Carl Schwan <carl@carlschwan.eu> (cherry picked from commit 01e2a26)
Co-authored-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com> Signed-off-by: Carl Schwan <carl@carlschwan.eu> (cherry picked from commit ef31396)
nextcloud-command
force-pushed
the
backport/stable25/31499
branch
from
c509273
to
7416f44
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #35347
Fix #35443
Manual backport of #31499