Skip to content

Make remote follow username regex comply to rfc 7565 #3528

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
hughrun merged 10 commits into from
Apr 1, 2025
Merged

Make remote follow username regex comply to rfc 7565 #3528

Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4fda7e7
Updated osstatus_follow_request acct: regex to comply with RFC 7565 a…
timothyjrogers Mar 27, 2025
d83c767
Fixed format error
timothyjrogers Mar 27, 2025
c5b0523
Merge branch 'main' into make-remote-follow-username-regex-comply-to-…
hughrun Mar 30, 2025
024807b
Moved remote user URL into regex utility
timothyjrogers Mar 30, 2025
5aec20a
Merge branch 'main' of github.com:timothyjrogers/bookwyrm into make-r…
timothyjrogers Mar 30, 2025
dc31e76
Condensed REMOTENAME regex literals
timothyjrogers Mar 30, 2025
85c7a85
Merge branch 'make-remote-follow-username-regex-comply-to-rfc-7565' o…
timothyjrogers Mar 30, 2025
c9406c4
Split long REMOTENAME regex into multiline string for readability
timothyjrogers Mar 30, 2025
1d873a3
Restricing REMOTENAME regex to just RFC 7565 characters that are URI …
timothyjrogers Mar 31, 2025
47c2196
Merge branch 'main' into make-remote-follow-username-regex-comply-to-…
hughrun Mar 31, 2025
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
3 changes: 2 additions & 1 deletion bookwyrm/views/follow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@
"""prepare an outgoing remote follow request"""
uri = urllib.parse.unquote(request.GET.get("acct"))
username_parts = re.search(
r"(?:^http(?:s?):\/\/)([\w\-\.]*)(?:.)*(?:(?:\/)([\w]*))", uri
r"(?:^http(?:s?):\/\/)([\w\-\.]*)(?:.)*(?:(?:\/)([A-Za-z0-9\-\.\_\~\!\$\&\'\(\)\*\+\,\;\=](?:[A-Za-z0-9\-\.\_\~\!\$\&\'\(\)\*\+\,\;\=]|(?:%[0-9A-Fa-f]{2}))*))",
uri,
)
account = f"{username_parts[2]}@{username_parts[1]}"
user = handle_remote_webfinger(account)
Expand Down
Loading