Create DB session provider(based on xorm) #13031

zeripath · 2020-10-04T20:35:39Z

This PR creates a Xorm session provider which creates
the appropriate Session table for macaron/session.

Signed-off-by: Andrew Thornton art27@cantab.net

This PR creates a Xorm session provider which creates the appropriate Session table for macaron/session. Fix go-gitea#7137 Signed-off-by: Andrew Thornton <art27@cantab.net>

Signed-off-by: Andrew Thornton <art27@cantab.net>

lafriks · 2020-10-05T06:04:19Z

lint failure ;)

Signed-off-by: Andrew Thornton <art27@cantab.net>

codecov-commenter · 2020-10-05T09:03:07Z

Codecov Report

Merging #13031 into master will decrease coverage by 0.06%.
The diff coverage is 2.02%.

@@            Coverage Diff             @@
##           master   #13031      +/-   ##
==========================================
- Coverage   42.62%   42.55%   -0.07%     
==========================================
  Files         672      675       +3     
  Lines       73785    73933     +148     
==========================================
+ Hits        31448    31460      +12     
- Misses      37247    37387     +140     
+ Partials     5090     5086       -4

Impacted Files	Coverage Δ
models/migrations/migrations.go	`2.46% <ø> (ø)`
models/migrations/v153.go	`0.00% <0.00%> (ø)`
models/session.go	`0.00% <0.00%> (ø)`
modules/session/xorm.go	`2.63% <2.63%> (ø)`
models/models.go	`56.15% <100.00%> (+0.21%)`	⬆️
modules/indexer/stats/db.go	`52.17% <0.00%> (-17.40%)`	⬇️
models/unit.go	`46.57% <0.00%> (-2.74%)`	⬇️
models/gpg_key.go	`53.33% <0.00%> (-0.58%)`	⬇️
... and 7 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5e1c51c...602be9c. Read the comment docs.

Signed-off-by: Andrew Thornton <art27@cantab.net>

models/migrations/v153.go

Co-authored-by: 6543 <6543@obermui.de>

lafriks · 2020-10-15T05:27:04Z

conflicts ;)

zeripath · 2020-10-15T05:51:00Z

done

modules/session/xorm.go

Co-authored-by: techknowlogick <matti@mdranta.net>

lunny · 2020-10-15T09:18:15Z

But this still don't resolve the mysql session provider unavailable problem? Could we change mysql as an alias of xorm provider?

codecov-io · 2020-10-15T09:24:18Z

Codecov Report

Merging #13031 (39f1565) into master (487f2ee) will increase coverage by 0.02%.
The diff coverage is 45.58%.

@@            Coverage Diff             @@
##           master   #13031      +/-   ##
==========================================
+ Coverage   42.21%   42.23%   +0.02%     
==========================================
  Files         767      770       +3     
  Lines       81624    81888     +264     
==========================================
+ Hits        34458    34586     +128     
- Misses      41531    41674     +143     
+ Partials     5635     5628       -7

Impacted Files	Coverage Δ
models/migrations/migrations.go	`2.59% <ø> (ø)`
models/migrations/v172.go	`0.00% <0.00%> (ø)`
models/session.go	`0.00% <0.00%> (ø)`
modules/session/virtual.go	`60.20% <0.00%> (-1.26%)`	⬇️
modules/structs/issue.go	`0.00% <ø> (ø)`
modules/session/db.go	`2.63% <2.63%> (ø)`
modules/queue/unique_queue_disk_channel.go	`55.22% <50.00%> (+1.37%)`	⬆️
models/models.go	`57.42% <100.00%> (+0.21%)`	⬆️
modules/setting/session.go	`89.47% <100.00%> (ø)`
modules/setting/setting.go	`49.03% <100.00%> (ø)`
... and 17 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5e5b063...39f1565. Read the comment docs.

zeripath · 2020-10-15T09:43:29Z

well the idea would be that the other db session providers would be considered deprecated.

lafriks · 2020-10-31T13:26:45Z

Imho we should just remove them and add breaking change here. Also we could make it a default one.
Would it be possible to add user id column somehow?

Signed-off-by: Andrew Thornton <art27@cantab.net>

zeripath · 2020-10-31T16:28:09Z

Imho we should just remove them and add breaking change here.

So removing the mysql and postgres providers may be a little aggressive - happy to remove them if wanted though.

Also we could make it a default one.

In terms of making it the default I think there is still a place for the filesystem based sessions.

Would it be possible to add user id column somehow?

Adding the User ID would be a breaking change from the macaron session provider stuff - we'd have to change the API considerably.

lafriks · 2020-10-31T19:29:39Z

I don't see much need for options duplicating functionality.
If no user id can be added than probably type should be renamed to SessionData or something like that to keep Session reserved for actual user session management in future

zeripath · 2020-10-31T19:47:01Z

The tablename session is required to maintain compatibility with the original mysql/postgres provider tables.

lafriks · 2020-10-31T19:50:08Z

I don't think thats much of the problem that we lose session data, it's not critical

stale · 2020-12-31T20:18:07Z

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs during the next 2 months. Thank you for your contributions.

zeripath · 2021-01-03T19:45:37Z

conflicts fixed

lunny · 2021-01-04T01:05:47Z

Since macaron will be replaced by chi, I would like to merge this after macaron has been replaced.

lunny · 2021-01-26T17:16:06Z

Please resolve the conflicts.

zeripath · 2021-02-10T20:35:23Z

@lunny I've updated.

I don't think there's any changes with chi-session but you might be more aware of these.

models/migrations/migrations.go

models/session.go

lunny

And I would like name it DB session.

models/session.go

zeripath · 2021-02-13T20:02:12Z

~~You mean from XormSession to DBSession?~~ Done

Signed-off-by: Andrew Thornton <art27@cantab.net>

techknowlogick · 2021-02-15T05:33:19Z

🚀

Create Xorm session provider

328eea5

This PR creates a Xorm session provider which creates the appropriate Session table for macaron/session. Fix go-gitea#7137 Signed-off-by: Andrew Thornton <art27@cantab.net>

zeripath added the type/feature Completely new functionality. Can only be merged if feature freeze is not active. label Oct 4, 2020

zeripath added this to the 1.14.0 milestone Oct 4, 2020

extraneous l

62422fe

Signed-off-by: Andrew Thornton <art27@cantab.net>

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 5, 2020

zeripath added 2 commits October 5, 2020 09:14

fix lint

6d15b3e

Signed-off-by: Andrew Thornton <art27@cantab.net>

Merge remote-tracking branch 'origin/master' into xorm-session-provider

895c378

zeripath added 2 commits October 5, 2020 10:21

use key instead of ID to be compatible with go-macaron/session

f32c7e4

Signed-off-by: Andrew Thornton <art27@cantab.net>

And change the migration too.

b551f02

Signed-off-by: Andrew Thornton <art27@cantab.net>

6543 reviewed Oct 5, 2020

View reviewed changes

models/migrations/v153.go Outdated Show resolved Hide resolved

Update spacing of imports

602be9c

Co-authored-by: 6543 <6543@obermui.de>

Merge remote-tracking branch 'origin/master' into xorm-session-provider

3715fe4

techknowlogick reviewed Oct 15, 2020

View reviewed changes

modules/session/xorm.go Outdated Show resolved Hide resolved

zeripath and others added 2 commits October 15, 2020 07:10

Update modules/session/xorm.go

2a32914

Co-authored-by: techknowlogick <matti@mdranta.net>

Merge branch 'master' into xorm-session-provider

bb69a28

Merge remote-tracking branch 'origin/master' into xorm-session-provider

ef6f4ac

add xorm provider to the virtual provider

f73ac12

Signed-off-by: Andrew Thornton <art27@cantab.net>

stale bot removed the issue/stale label Jan 3, 2021

zeripath added 2 commits February 10, 2021 20:28

prep for merge master

d830fa6

Merge remote-tracking branch 'origin/master' into xorm-session-provider

8b85e35

lunny reviewed Feb 13, 2021

View reviewed changes

models/migrations/migrations.go Outdated Show resolved Hide resolved

lunny reviewed Feb 13, 2021

View reviewed changes

models/session.go Outdated Show resolved Hide resolved

lunny requested changes Feb 13, 2021

View reviewed changes

models/session.go Outdated Show resolved Hide resolved

models/session.go Outdated Show resolved Hide resolved

zeripath commented Feb 13, 2021

View reviewed changes

models/session.go Outdated Show resolved Hide resolved

As per @lunny

4e699d2

zeripath added 3 commits February 14, 2021 10:26

move migration out of the way

6c19eef

Merge remote-tracking branch 'origin/master' into xorm-session-provider

54f04f4

Move to call this db session as per @lunny

0ad7db5

Signed-off-by: Andrew Thornton <art27@cantab.net>

6543 approved these changes Feb 14, 2021

View reviewed changes

GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Feb 14, 2021

Merge branch 'master' into xorm-session-provider

39f1565

lunny approved these changes Feb 15, 2021

View reviewed changes

GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Feb 15, 2021

lunny changed the title ~~Create Xorm session provider~~ Create DB session provider(based on xorm) Feb 15, 2021

Merge branch 'master' into xorm-session-provider

dcebdfe

techknowlogick merged commit 0a9a484 into go-gitea:master Feb 15, 2021

zeripath deleted the xorm-session-provider branch February 15, 2021 07:02

go-gitea locked and limited conversation to collaborators May 13, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Create DB session provider(based on xorm) #13031

Create DB session provider(based on xorm) #13031

zeripath commented Oct 4, 2020

lafriks commented Oct 5, 2020

codecov-commenter commented Oct 5, 2020 •

edited

Loading

lafriks commented Oct 15, 2020

zeripath commented Oct 15, 2020

lunny commented Oct 15, 2020

codecov-io commented Oct 15, 2020 •

edited

Loading

zeripath commented Oct 15, 2020

lafriks commented Oct 31, 2020

zeripath commented Oct 31, 2020

lafriks commented Oct 31, 2020

zeripath commented Oct 31, 2020

lafriks commented Oct 31, 2020

stale bot commented Dec 31, 2020

zeripath commented Jan 3, 2021

lunny commented Jan 4, 2021

lunny commented Jan 26, 2021

zeripath commented Feb 10, 2021

lunny left a comment

zeripath commented Feb 13, 2021 •

edited

Loading

techknowlogick commented Feb 15, 2021

Create DB session provider(based on xorm) #13031

Create DB session provider(based on xorm) #13031

Conversation

zeripath commented Oct 4, 2020

lafriks commented Oct 5, 2020

codecov-commenter commented Oct 5, 2020 • edited Loading

Codecov Report

lafriks commented Oct 15, 2020

zeripath commented Oct 15, 2020

lunny commented Oct 15, 2020

codecov-io commented Oct 15, 2020 • edited Loading

Codecov Report

zeripath commented Oct 15, 2020

lafriks commented Oct 31, 2020

zeripath commented Oct 31, 2020

lafriks commented Oct 31, 2020

zeripath commented Oct 31, 2020

lafriks commented Oct 31, 2020

stale bot commented Dec 31, 2020

zeripath commented Jan 3, 2021

lunny commented Jan 4, 2021

lunny commented Jan 26, 2021

zeripath commented Feb 10, 2021

lunny left a comment

Choose a reason for hiding this comment

zeripath commented Feb 13, 2021 • edited Loading

techknowlogick commented Feb 15, 2021

codecov-commenter commented Oct 5, 2020 •

edited

Loading

codecov-io commented Oct 15, 2020 •

edited

Loading

zeripath commented Feb 13, 2021 •

edited

Loading