LBRYCommunity/lbry-redux
1
0
Fork 0
Code Issues 5 Pull requests 6 Projects Releases Packages Wiki Activity

error on space characters in parseURI

Browse source
This commit is contained in:
Sean Yesmunt 2019-10-08 10:14:50 -04:00
parent ae4f18838d
commit 22c601ab9b
2 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
dist/bundle.es.js vendored
View file

@ -971,14 +971,20 @@ function parseURI(URL, requireProto = false) {
// Validate protocol
if (requireProto && !proto) {
throw new Error(__('LBRY URIs must include a protocol prefix (lbry://).'));
throw new Error(__('LBRY URLs must include a protocol prefix (lbry://).'));
}
// Validate and process name
if (!streamNameOrChannelName) {
throw new Error(__('URI does not include name.'));
throw new Error(__('URL does not include name.'));
}
rest.forEach(urlPiece => {
if (urlPiece && urlPiece.includes(' ')) {
throw new Error('URL can not include a space');
}
});
const includesChannel = streamNameOrChannelName.startsWith('@');
const isChannel = streamNameOrChannelName.startsWith('@') && !possibleStreamName;
const channelName = includesChannel && streamNameOrChannelName.slice(1);
@ -1108,7 +1114,8 @@ function normalizeURI(URL) {
function isURIValid(URL) {
try {
parseURI(normalizeURI(URL));
let parts = parseURI(normalizeURI(URL));
console.log('parts', parts);
} catch (error) {
return false;
}

21
src/lbryURI.js
View file

@ -10,9 +10,7 @@ const regexPartProtocol = '^((?:lbry://)?)';
const regexPartStreamOrChannelName = '([^:$#/]*)';
const regexPartModifierSeparator = '([:$#]?)([^/]*)';
const queryStringBreaker = '^([\\S]+)([?][\\S]*)';
const separateQuerystring = new RegExp(
queryStringBreaker
);
const separateQuerystring = new RegExp(queryStringBreaker);
/**
* Parses a LBRY name into its component parts. Throws errors with user-friendly
@ -44,7 +42,7 @@ export function parseURI(URL: string, requireProto: boolean = false): LbryUrlObj
);
// chop off the querystring first
let QSStrippedURL, qs;
const qsRegexResult = separateQuerystring.exec(URL)
const qsRegexResult = separateQuerystring.exec(URL);
if (qsRegexResult) {
[QSStrippedURL, qs] = qsRegexResult.slice(1).map(match => match || null);
}
@ -65,14 +63,20 @@ export function parseURI(URL: string, requireProto: boolean = false): LbryUrlObj
// Validate protocol
if (requireProto && !proto) {
throw new Error(__('LBRY URIs must include a protocol prefix (lbry://).'));
throw new Error(__('LBRY URLs must include a protocol prefix (lbry://).'));
}
// Validate and process name
if (!streamNameOrChannelName) {
throw new Error(__('URI does not include name.'));
throw new Error(__('URL does not include name.'));
}
rest.forEach(urlPiece => {
if (urlPiece && urlPiece.includes(' ')) {
throw new Error('URL can not include a space');
}
});
const includesChannel = streamNameOrChannelName.startsWith('@');
const isChannel = streamNameOrChannelName.startsWith('@') && !possibleStreamName;
const channelName = includesChannel && streamNameOrChannelName.slice(1);
@ -119,7 +123,7 @@ export function parseURI(URL: string, requireProto: boolean = false): LbryUrlObj
claimName: streamNameOrChannelName,
claimId: primaryClaimId,
...(streamName ? { contentName: streamName } : {}),
...(qs ? { queryString: qs} : {}),
...(qs ? { queryString: qs } : {}),
};
}
@ -256,7 +260,8 @@ export function normalizeURI(URL: string) {
export function isURIValid(URL: string): boolean {
try {
parseURI(normalizeURI(URL));
let parts = parseURI(normalizeURI(URL));
console.log('parts', parts);
} catch (error) {
return false;
}