Feature implementation from commits 29e37e8..2d3126b #5
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,7 +19,7 @@ import ( | |
| var ( | ||
| Version_x byte = 25 | ||
| Version_y byte = 3 | ||
| Version_z byte = 31 | ||
| ) | ||
|
|
||
| var ( | ||
|
|
||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,6 +25,7 @@ type NameServerConfig struct { | |
| TimeoutMs uint64 `json:"timeoutMs"` | ||
| } | ||
|
|
||
| // UnmarshalJSON implements encoding/json.Unmarshaler.UnmarshalJSON | ||
| func (c *NameServerConfig) UnmarshalJSON(data []byte) error { | ||
| var address Address | ||
| if err := json.Unmarshal(data, &address); err == nil { | ||
|
|
@@ -163,6 +164,18 @@ type HostAddress struct { | |
| addrs []*Address | ||
| } | ||
|
|
||
| // MarshalJSON implements encoding/json.Marshaler.MarshalJSON | ||
| func (h *HostAddress) MarshalJSON() ([]byte, error) { | ||
| if (h.addr != nil) != (h.addrs != nil) { | ||
| if h.addr != nil { | ||
| return json.Marshal(h.addr) | ||
| } else if h.addrs != nil { | ||
| return json.Marshal(h.addrs) | ||
| } | ||
| } | ||
| return nil, errors.New("unexpected config state") | ||
| } | ||
|
|
||
| // UnmarshalJSON implements encoding/json.Unmarshaler.UnmarshalJSON | ||
| func (h *HostAddress) UnmarshalJSON(data []byte) error { | ||
| addr := new(Address) | ||
|
|
@@ -208,6 +221,11 @@ func getHostMapping(ha *HostAddress) *dns.Config_HostMapping { | |
| } | ||
| } | ||
|
|
||
| // MarshalJSON implements encoding/json.Marshaler.MarshalJSON | ||
| func (m *HostsWrapper) MarshalJSON() ([]byte, error) { | ||
| return json.Marshal(m.Hosts) | ||
| } | ||
|
|
||
| // UnmarshalJSON implements encoding/json.Unmarshaler.UnmarshalJSON | ||
| func (m *HostsWrapper) UnmarshalJSON(data []byte) error { | ||
| hosts := make(map[string]*HostAddress) | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,6 +20,18 @@ type FakeDNSConfig struct { | |
| pools []*FakeDNSPoolElementConfig | ||
| } | ||
|
|
||
| // MarshalJSON implements encoding/json.Marshaler.MarshalJSON | ||
| func (f *FakeDNSConfig) MarshalJSON() ([]byte, error) { | ||
| if (f.pool != nil) != (f.pools != nil) { | ||
| if f.pool != nil { | ||
| return json.Marshal(f.pool) | ||
| } else if f.pools != nil { | ||
| return json.Marshal(f.pools) | ||
| } | ||
| } | ||
| return nil, errors.New("unexpected config state") | ||
| } | ||
|
|
||
| // UnmarshalJSON implements encoding/json.Unmarshaler.UnmarshalJSON | ||
| func (f *FakeDNSConfig) UnmarshalJSON(data []byte) error { | ||
| var pool FakeDNSPoolElementConfig | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -67,7 +67,7 @@ func (c *WireGuardConfig) Build() (proto.Message, error) { | |
| var err error | ||
| config.SecretKey, err = ParseWireGuardKey(c.SecretKey) | ||
| if err != nil { | ||
| return nil, errors.New("invalid WireGuard secret key: %w", err) | ||
| } | ||
|
|
||
| if c.Address == nil { | ||
|
|
@@ -126,6 +126,10 @@ func (c *WireGuardConfig) Build() (proto.Message, error) { | |
| func ParseWireGuardKey(str string) (string, error) { | ||
| var err error | ||
|
|
||
| if str == "" { | ||
| return "", errors.New("key must not be empty") | ||
| } | ||
|
|
||
| if len(str)%2 == 0 { | ||
| _, err = hex.DecodeString(str) | ||
| if err == nil { | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🐛 Correctness Issue
Breaking API Change: Receiver Type Changed.
Changed from value receiver to pointer receiver which breaks backward compatibility for any code calling MarshalJSON on non-pointer values.
Current Code (Diff):
📝 Committable suggestion