Feature/rfc 7710 #5781
Merged
Feature/rfc 7710 #5781
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
julsemaan
reviewed
Sep 10, 2020
go/dhcp/config.go
Outdated
| portalURL := "https://" + ConfNet.PortalFQDN + "/api" | ||
| options[dhcp.OptionCaptivePortal] = []byte(portalURL) | ||
| } else { | ||
| portalURL := "https://" + general.Hostname + "." + general.Domain + "/api" |
There was a problem hiding this comment.
can we use something more meaningful than /api ?
Or is this path part of the spec.
Using /rfc7710 would make it more explicit when analyzing logs
go/dhcp/config.go
Outdated
| @@ -340,6 +355,15 @@ func (d *Interfaces) readConfig() { | |||
| options[dhcp.OptionDomainNameServer] = ShuffleDNS(ConfNet) | |||
| options[dhcp.OptionRouter] = ShuffleGateway(ConfNet) | |||
| options[dhcp.OptionDomainName] = []byte(ConfNet.DomainName) | |||
| if portal.SecureRedirect == "enabled" { | |||
| if ConfNet.PortalFQDN != "" { | |||
There was a problem hiding this comment.
Could we use the code of detectPortalURL that we move in util/ to build the URL of the portal so that the logic isn't duplicated
|
@fdurand Please rebase and @julsemaan do a final a review and merge after. |
fdurand
force-pushed
the
feature/rfc-7710
branch
from
717433e
to
4343d59
Compare
|
Rebased |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
rfc-7710 support
Impacts
DHCP + Portal
Issue
fixes #5638
Delete branch after merge
YES
Checklist
NEWS file entries
New Features