Commit441bff5

authored

feat: support http coder urls (#217)

Currently, in the Login Form, we reject non-https URLs. When this HTTPS requirement was added, the Coder Desktop app was unable to make HTTP requests, as it did not have `NSArbitraryLoads`. We ended up needing to enable that flag in order to use the Agent API. (`http://workspace.coder:4`)To support Coder deployments behind VPNs without HTTPS, we can now loosen the requirement. With this PR, the behavior [matches Windows.](https://github.com/coder/coder-desktop-windows/blob/ac22fe4c44dea03b21557b4a0f1e214397bc3ea4/App/Services/CredentialManager.cs#L175-L176)

1 parentf5d0741 commit441bff5Copy full SHA for 441bff5

File tree

-7

lines changed

-7

lines changed

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -194,8 +194,8 @@ func validateURL(_ url: String) throws(LoginError) -> URL {`
`194`	`194`	`guardlet url=URL(string: url)else{`
`195`	`195`	`throw.invalidURL`
`196`	`196`	`}`
`197`		`-guard url.scheme=="https"else{`
`198`		`-throw.httpsRequired`
	`197`	`+guard url.scheme=="https"\|\| url.scheme=="http"else{`
	`198`	`+throw.invalidScheme`
`199`	`199`	`}`
`200`	`200`	`guard url.host!=nilelse{`
`201`	`201`	`throw.noHost`
`@@ -204,7 +204,7 @@ func validateURL(_ url: String) throws(LoginError) -> URL {`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`enumLoginError:Error{`
`207`		`-casehttpsRequired`
	`207`	`+caseinvalidScheme`
`208`	`208`	`case noHost`
`209`	`209`	`case invalidURL`
`210`	`210`	`case outdatedCoderVersion`
`@@ -213,12 +213,12 @@ enum LoginError: Error {`
`213`	`213`
`214`	`214`	`vardescription:String{`
`215`	`215`	`switchself{`
`216`		`-case.httpsRequired:`
`217`		`-"URL must use HTTPS"`
	`216`	`+case.invalidScheme:`
	`217`	`+"CoderURL must use HTTPS or HTTP"`
`218`	`218`	`case.noHost:`
`219`		`-"URL must have a host"`
	`219`	`+"CoderURL must have a host"`
`220`	`220`	`case.invalidURL:`
`221`		`-"Invalid URL"`
	`221`	`+"InvalidCoderURL"`
`222`	`222`	`case.outdatedCoderVersion:`
`223`	`223`	`"""`
`224`	`224`	`The Coder deployment must be version\(Validator.minimumCoderVersion)`

Comments

(0)