Skip to content
This repository was archived by the owner on May 2, 2022. It is now read-only.

Prevent case that login search string is empty #9

Open
linonetwo wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Prevent case that login search string is empty #9

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b37b448
Prevent case that login search string is empty
linonetwo Jan 8, 2020
cef6840
refactor: throw if search string is incorrect in login response
linonetwo Jan 10, 2020
8a6bae0
lint: run prettier
linonetwo Jan 10, 2020
04649fd
fix: typo
linonetwo Jan 11, 2020
e3e72f9
lint: format lone line
linonetwo Jan 11, 2020
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
32 changes: 24 additions & 8 deletions src/SolidClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,7 @@ class SolidClient {
// Extract the password form's hidden fields
const loginParams = { loginUrl };
let match, inputRegex = /<input.*?name="([^"]+)".*?value="([^"]+)"/g;
while (match = inputRegex.exec(passwordForm))
loginParams[match[1]] = match[2];
while ((match = inputRegex.exec(passwordForm))) loginParams[match[1]] = match[2];

return loginParams;
}
Expand Down Expand Up @@ -181,7 +180,22 @@ class SolidClient {
if (this.isAboveVersion511(loginResponse.headers['x-powered-by'])) {
const consentUrl = new URL(authUrl);
const search = consentUrl.search.substring(1);
let consPostData = JSON.parse('{"' + decodeURIComponent(search).replace(/"/g, '\\"').replace(/&/g, '","').replace(/\=/g, '":"') + '"}');
if (!search) {
throw new Error(`Login response doesn't contain a search string: ${authUrl}`);
}
let consPostData = {};
try {
const searchJson = decodeURIComponent(search)
.replace(/"/g, '\\"')
.replace(/&/g, '","')
.replace(/\=/g, '":"');
consPostData = JSON.parse(`{"${searchJson}"}`);
}
catch (error) {
throw new Error(
`Login response doesn't contain a search string: ${authUrl} , cause JSON parsing error ${error}`
);
}
consPostData.consent = true;
consPostData.access_mode = ['Read', 'Write', 'Append', 'Control'];
consPostData = querystring.stringify(consPostData);
Expand All @@ -197,9 +211,11 @@ class SolidClient {
authUrl = consentResponse.headers.location;
}

const authResponse = await this.fetch(Object.assign(parseUrl(authUrl), {
headers: { cookie },
}));
const authResponse = await this.fetch(
Object.assign(parseUrl(authUrl), {
headers: { cookie },
})
);

// Obtain the access URL from the redirected response
const accessUrl = authResponse.headers.location;
Expand All @@ -224,7 +240,7 @@ class SolidClient {
request.end(data);
request.on('response', response => {
response.body = '';
response.on('data', data => response.body += data);
response.on('data', data => (response.body += data));
response.on('end', () => resolve(response));
});
request.on('error', reject);
Expand All @@ -240,7 +256,7 @@ class SolidClient {
*/
isExpired(session) {
const now = Date.now() / 1000;
const expiry = session.idClaims && session.idClaims.exp || 0;
const expiry = (session.idClaims && session.idClaims.exp) || 0;
return expiry < now;
}
}
Expand Down