Skip to content

fix #989: url escape issue and better url validation #1014

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

Open
flx-sta wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix #989: url escape issue and better url validation #1014

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77050ef
fix #989: url escape issue
flx-sta Oct 2, 2023
0195e97
fix #989: url escape issue
flx-sta Oct 2, 2023
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
57 changes: 27 additions & 30 deletions src/helpers/LinkHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,15 +170,14 @@ const openLemmyLink = (

const openWebLink = (link: string, color = "#000"): void => {
const { settings } = useSettingsStore.getState();
const urlPattern =
/(http|https):\/\/([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])/;

try {
writeToLog(`Trying to open link: ${link}`);

let fixedLink = decodeURIComponent(link);
fixedLink = fixedLink.match(urlPattern)[0];
fixedLink = fixedLink.replace("%5D", "");
const url = new URL(link);
const fixedLink = url.toString().replace("%5D", "");

writeToLog(`fixed link: ${fixedLink}`);

// TODO Remove this once Expo publishes new fix. For now this will stop matrix crashes

Expand All @@ -203,7 +202,7 @@ const openWebLink = (link: string, color = "#000"): void => {
writeToLog(e.toString());
});
} catch (e) {
writeToLog("Error opening link.");
writeToLog(`Error opening link: ${link}`);
writeToLog(e.toString());
Alert.alert("Error.", e.toString());
}
Expand All @@ -214,39 +213,37 @@ export const openLink = (
navigation: NativeStackNavigationProp<any>,
color = "#000"
): void => {
const urlPattern =
/(http|https):\/\/([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])/;

writeToLog(`Trying to open link: ${link}`);

if (!urlPattern.test(link)) {
try {
const url = new URL(link);
const urlStr = url.toString();
const potentialFed = isPotentialFedSite(urlStr);

if (potentialFed) {
isLemmySite(link)
.then((isLemmy) => {
if (isLemmy) {
openLemmyLink(link, navigation, color);
} else {
openWebLink(link, color);
}
})
.catch(() => {
openWebLink(link, color);
});
} else {
openWebLink(link, color);
}
} catch (err) {
store.dispatch(
showToast({
message: i18n.t("toast.linkError"),
duration: 3000,
variant: "error",
})
);
return;
}

link = link.match(urlPattern)[0];

const potentialFed = isPotentialFedSite(link);
if (potentialFed) {
isLemmySite(link)
.then((isLemmy) => {
if (isLemmy) {
openLemmyLink(link, navigation, color);
} else {
openWebLink(link, color);
}
})
.catch(() => {
openWebLink(link, color);
});
} else {
openWebLink(link, color);
writeToLog(`Link failed url parsing: ${link}.\nERROR: ${err}`);
}
};

Expand Down