Skip to content

Sanitize and validate URL input to remove unwanted characters. #286

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
merged 2 commits into from
Apr 28, 2024
Merged

Sanitize and validate URL input to remove unwanted characters. #286

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d9ab7d
Sanitize and validate URL input to remove unwanted characters.
bjorkert Apr 26, 2024
678b061
Code cleanup
bjorkert Apr 26, 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
28 changes: 18 additions & 10 deletions LoopFollow/ViewControllers/SettingsViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,21 +128,29 @@ class SettingsViewController: FormViewController {
guard let value = row.value else {
UserDefaultsRepository.url.value = ""
self.showHideNSDetails()
return }
// check the format of the URL entered by the user and trim away any spaces or "/" at the end
var urlNSInput = value.replacingOccurrences(of: "\\s+$", with: "", options: .regularExpression)
if urlNSInput.last == "/" {
urlNSInput = String(urlNSInput.dropLast())
return
}
UserDefaultsRepository.url.value = urlNSInput.lowercased()
// set the row value back to the correctly formatted URL so that the user immediately sees how it should have been written
row.value = UserDefaultsRepository.url.value

// Normalize input: remove unwanted characters and lowercase
let filtered = value.replacingOccurrences(of: "[^A-Za-z0-9:/._-]", with: "", options: .regularExpression).lowercased()

// Further clean-up: Remove trailing slashes
var cleanURL = filtered
while cleanURL.last == "/" {
cleanURL = String(cleanURL.dropLast())
}

// Set the cleaned URL
UserDefaultsRepository.url.value = cleanURL
row.value = cleanURL

self.showHideNSDetails()
globalVariables.nsVerifiedAlert = 0

// Verify Nightscout URL and token
self.checkNightscoutStatus()
}

<<< TextRow() { row in
row.title = "NS Token"
row.placeholder = "Leave blank if not using tokens"
Expand Down Expand Up @@ -174,15 +182,15 @@ class SettingsViewController: FormViewController {
row.tag = "loopUser"
row.value = UserDefaultsRepository.loopUser.value
row.hidden = "$showNS == false"
}.onChange { [weak self] row in
}.onChange { row in
guard let value = row.value else { return }
UserDefaultsRepository.loopUser.value = value
}

<<< SwitchRow("showDex"){ row in
row.title = "Show Dexcom Settings"
row.value = UserDefaultsRepository.showDex.value
}.onChange { [weak self] row in
}.onChange { row in
guard let value = row.value else { return }
UserDefaultsRepository.showDex.value = value
}
Expand Down