Skip to content
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

Sanitize relay url to not allow protocol. #490

Closed
wants to merge 3 commits into from
Closed

Sanitize relay url to not allow protocol. #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
307c25e
Sanitize relay url to not allow protocol.
GhostofCookie Sep 16, 2024
4486ac9
Sanitize manifest url.
GhostofCookie Sep 16, 2024
8657ef8
Sanitize always.
GhostofCookie Sep 17, 2024
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
5 changes: 4 additions & 1 deletion Decimus/ManifestController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,10 @@ class ManifestController {
}

private func makeRequest(method: String, components: URLComponents) throws -> URLRequest {
guard let url = URL(string: components.string!) else {
guard let str = components.string else {
throw "Invalid URL: no components"
}
guard let url = URL(string: str) else {
throw "Invalid URL: \(components)"
}

Expand Down
5 changes: 5 additions & 0 deletions Decimus/Views/Settings/ManifestSettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ struct ManifestSettingsView: View {
LabeledContent("Address") {
TextField("manifest_address", text: $manifestConfig.value.url, prompt: Text("127.0.0.1"))
.keyboardType(.URL)
.onChange(of: manifestConfig.value.url) {
if let url = URL(string: manifestConfig.value.url) {
manifestConfig.value.url = url.host() ?? manifestConfig.value.url;
}
}
}

LabeledContent("Port") {
Expand Down
5 changes: 5 additions & 0 deletions Decimus/Views/Settings/RelaySettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ struct RelaySettingsView: View {
LabeledContent("Address") {
TextField("relay_address", text: $relayConfig.value.address, prompt: Text("localhost"))
.keyboardType(.URL)
.onChange(of: relayConfig.value.address) {
if let url = URL(string: relayConfig.value.address) {
relayConfig.value.address = url.host() ?? relayConfig.value.address;
}
}
}

LabeledContent("Protocol") {
Expand Down