Skip to content

Update the token on session regeneration - #9823

Merged
blizzz merged 1 commit into
masterfrom
bufgix/noid/update_token_on_session_id_regenerate
Jun 18, 2018
Merged

Update the token on session regeneration#9823
blizzz merged 1 commit into
masterfrom
bufgix/noid/update_token_on_session_id_regenerate

Conversation

@rullzer

Copy link
Copy Markdown
Member

More abstraced form of #9756

@codecov

codecovBot commented Jun 11, 2018

Copy link
Copy Markdown

Codecov Report

Merging #9823 into master will decrease coverage by <.01%.
The diff coverage is 11.76%.

@@ Coverage Diff @@## master #9823 +/- ##
============================================
- Coverage 51.92% 51.92% -0.01% - Complexity 25787 25791 +4 
============================================
Files 1637 1637 Lines 95453 95466 +13 Branches 1318 1318 ============================================
Hits 49567 49567 - Misses 45886 45899 +13
Impacted FilesCoverage ΔComplexity Δ
lib/private/Session/Memory.php86.95% <ø> (ø)11 <0> (ø)⬇️
lib/private/Session/CryptoSessionData.php64.91% <0%> (ø)21 <1> (ø)⬇️
lib/private/Session/Internal.php0% <0%> (ø)27 <6> (+4)⬆️
...s/files_sharing/lib/Controller/ShareController.php47.55% <100%> (ø)64 <0> (ø)⬇️
lib/private/User/Session.php75.23% <100%> (+0.07%)117 <0> (ø)⬇️
lib/private/Files/Cache/Propagator.php94.93% <0%> (-1.27%)16% <0%> (ø)

@rullzer
rullzerforce-pushed the bufgix/noid/update_token_on_session_id_regenerate branch 2 times, most recently from 58c69a9 to 091a376CompareJune 11, 2018 11:32
@rullzerrullzer added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jun 11, 2018
Comment threadlib/public/ISession.php Outdated
* @param bool $deleteOldSession Whether to delete the old associated session file or not.
* @param bool $updateToken Wheater to update the associated auth token
* @return void
* @since 9.0.0

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Document that $updateToken was added in 14.0.0

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code makes sense beside my little nitpick.

@rullzer
rullzerforce-pushed the bufgix/noid/update_token_on_session_id_regenerate branch from 091a376 to 708885dCompareJune 12, 2018 19:20
Sometimes when we force a session regeneration we want to update the
current token for this session.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer
rullzerforce-pushed the bufgix/noid/update_token_on_session_id_regenerate branch from 708885d to 8c47a63CompareJune 14, 2018 06:09
@rullzer

Copy link
Copy Markdown
MemberAuthor

Rebased to get green CI. All good now!

@blizzz
blizzz merged commit 60adc92 into masterJun 18, 2018
@blizzz
blizzz deleted the bufgix/noid/update_token_on_session_id_regenerate branch June 18, 2018 11:25
@MorrisJobke

Copy link
Copy Markdown
Member

@rullzer What about the backport here?

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsenhancement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@rullzer@MorrisJobke@blizzz