jeena/lemmy-simplified-federation
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Pleroma: username detection by request body

Browse source
This commit is contained in:
Austin Huang 2023-02-26 22:25:38 -05:00
parent a92434d3da
commit 94f0903614
No known key found for this signature in database
GPG key ID: 84C23AA04587A91F
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/background/modules/AutoRemoteFollow.js
View file

@ -170,7 +170,7 @@ async function onTabUpdate(tabId, changeInfo) {
function init() { function init() {
NetworkTools.webRequestListen(["http://*/*", "https://*/*"], "onBeforeRequest", (requestDetails) => { NetworkTools.webRequestListen(["http://*/*", "https://*/*"], "onBeforeRequest", (requestDetails) => {
return handleWebRequest(requestDetails).catch(handleError).catch(console.error); return handleWebRequest(requestDetails).catch(handleError).catch(console.error);
}); }, ["requestBody"]);
browser.tabs.onUpdated.addListener(onTabUpdate, { browser.tabs.onUpdated.addListener(onTabUpdate, {
properties: ["url"] properties: ["url"]

8
src/background/modules/Detect/Pleroma.js
View file

@ -110,6 +110,12 @@ export function getTootUrl(url) {
export function getUsername(url, requestDetails) { export function getUsername(url, requestDetails) {
redirectSiteFinishedLoading = false; redirectSiteFinishedLoading = false;
try {
return requestDetails.requestBody.formData.nickname[0];
} catch (e) {
console.error("Could not get username from request body. Error: ", e);
}
try { try {
const originUrl = new URL(requestDetails.originUrl); const originUrl = new URL(requestDetails.originUrl);
const match = USER_PAGE_URL_REGEX.exec(originUrl.pathname); const match = USER_PAGE_URL_REGEX.exec(originUrl.pathname);
@ -122,7 +128,7 @@ export function getUsername(url, requestDetails) {
console.error("Could not get valid username from request details. Got", originUrl, "from", requestDetails); console.error("Could not get valid username from request details. Got", originUrl, "from", requestDetails);
} }
} catch (e) { } catch (e) {
console.error("Could not get username from request details. Error: ", e); console.error("Could not get username from request origin. Error: ", e);
} }
// fallback to HTML scraping // fallback to HTML scraping