Skip to content

Fix/1317 (User not logged in 2) #1340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jaxoncreed merged 4 commits into from
Nov 8, 2019
Merged

Fix/1317 (User not logged in 2) #1340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a898f5e
Remove confusing 2 from message
Oct 18, 2019
55be05f
Merge branch 'dev' of https://github.com/solid/node-solid-server into…
Nov 4, 2019
8e9820d
Fixed user not logged in 2
jaxoncreed Nov 6, 2019
7e5ef82
Fix tests for new cookie name
Nov 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/create-app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ function initAuthentication (app, argv) {
*/
function sessionSettings (secureCookies, host) {
let sessionSettings = {
name: 'nssidp.sid',
secret: uuid.v1(),
saveUninitialized: false,
resave: false,
Expand Down
11 changes: 5 additions & 6 deletions lib/requests/sharing-request.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ class SharingRequest extends AuthRequest {
} else {
request.renderForm(null, req, appOrigin)
}
} else {
request.redirectPostSharing()
}
}

Expand Down Expand Up @@ -119,6 +121,8 @@ class SharingRequest extends AuthRequest {

// Redirect once that's all done
request.redirectPostSharing()
} else {
request.redirectPostSharing()
}
}

Expand All @@ -144,12 +148,7 @@ class SharingRequest extends AuthRequest {

isUserLoggedIn () {
// Ensure the user arrived here by logging in
if (!this.session.subject || !this.session.subject._id) {
this.response.status(401)
this.response.send('User not logged in 2')
return false
}
return true
return !!(this.session.subject && this.session.subject._id)
}

getAppUrl () {
Expand Down
12 changes: 6 additions & 6 deletions test/integration/authentication-oidc-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ describe('Authentication API (OIDC)', () => {
})

it('should set the cookie', () => {
expect(cookie).to.match(/connect.sid=\S{65,100}/)
expect(cookie).to.match(/nssidp.sid=\S{65,100}/)
})

it('should set the cookie with HttpOnly', () => {
Expand Down Expand Up @@ -247,7 +247,7 @@ describe('Authentication API (OIDC)', () => {
describe('with malicious cookie but without origin', () => {
let response
before(done => {
var malcookie = cookie.replace(/connect\.sid=(\S+)/, 'connect.sid=l33th4x0rzp0wn4g3;')
var malcookie = cookie.replace(/nssidp\.sid=(\S+)/, 'nssidp.sid=l33th4x0rzp0wn4g3;')
alice.get('/private-for-alice.txt')
.set('Cookie', malcookie)
.end((err, res) => {
Expand Down Expand Up @@ -353,7 +353,7 @@ describe('Authentication API (OIDC)', () => {
describe('with malicious cookie but with globally configured origin', () => {
let response
before(done => {
var malcookie = cookie.replace(/connect\.sid=(\S+)/, 'connect.sid=l33th4x0rzp0wn4g3;')
var malcookie = cookie.replace(/nssidp\.sid=(\S+)/, 'nssidp.sid=l33th4x0rzp0wn4g3;')
alice.get('/private-for-alice.txt')
.set('Cookie', malcookie)
.set('Origin', 'https://apps.solid.invalid')
Expand Down Expand Up @@ -407,7 +407,7 @@ describe('Authentication API (OIDC)', () => {
describe('with malicious cookie and our origin', () => {
let response
before(done => {
var malcookie = cookie.replace(/connect\.sid=(\S+)/, 'connect.sid=l33th4x0rzp0wn4g3;')
var malcookie = cookie.replace(/nssidp\.sid=(\S+)/, 'nssidp.sid=l33th4x0rzp0wn4g3;')
alice.get('/private-for-alice.txt')
.set('Cookie', malcookie)
.set('Origin', aliceServerUri)
Expand All @@ -425,7 +425,7 @@ describe('Authentication API (OIDC)', () => {
describe('with malicious cookie and a non-matching origin', () => {
let response
before(done => {
var malcookie = cookie.replace(/connect\.sid=(\S+)/, 'connect.sid=l33th4x0rzp0wn4g3;')
var malcookie = cookie.replace(/nssidp\.sid=(\S+)/, 'nssidp.sid=l33th4x0rzp0wn4g3;')
alice.get('/private-for-owner.txt')
.set('Cookie', malcookie)
.set('Origin', bobServerUri)
Expand Down Expand Up @@ -455,7 +455,7 @@ describe('Authentication API (OIDC)', () => {

describe('with trusted app and malicious cookie', () => {
before(done => {
var malcookie = cookie.replace(/connect\.sid=(\S+)/, 'connect.sid=l33th4x0rzp0wn4g3;')
var malcookie = cookie.replace(/nssidp\.sid=(\S+)/, 'nssidp.sid=l33th4x0rzp0wn4g3;')
alice.get('/private-for-alice.txt')
.set('Cookie', malcookie)
.set('Origin', trustedAppUri)
Expand Down
4 changes: 2 additions & 2 deletions test/integration/authentication-oidc-with-strict-origins-turned-off-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ describe('Authentication API (OIDC) - With strict origins turned off', () => {
})

it('should set the cookie', () => {
expect(cookie).to.match(/connect.sid=\S{65,100}/)
expect(cookie).to.match(/nssidp.sid=\S{65,100}/)
})

it('should set the cookie with HttpOnly', () => {
Expand Down Expand Up @@ -286,7 +286,7 @@ describe('Authentication API (OIDC) - With strict origins turned off', () => {
let malcookie
before(() => {
// How Mallory might set their cookie:
malcookie = cookie.replace(/connect\.sid=(\S+)/, 'connect.sid=l33th4x0rzp0wn4g3;')
malcookie = cookie.replace(/nssidp\.sid=(\S+)/, 'nssidp.sid=l33th4x0rzp0wn4g3;')
})
describe('and no origin set', () => {
before(done => {
Expand Down