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

fix: update ieee8021x config struct to be a pointer #427

Merged
merged 1 commit into from
Oct 17, 2024
Merged

fix: update ieee8021x config struct to be a pointer #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 16 additions & 16 deletions pkg/config/v2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,29 +31,29 @@ type Network struct {
}

type Wired struct {
DHCPEnabled bool `yaml:"dhcpEnabled"`
IPSyncEnabled bool `yaml:"ipSyncEnabled"`
SharedStaticIP bool `yaml:"sharedStaticIP"`
IPAddress string `yaml:"ipAddress"`
SubnetMask string `yaml:"subnetMask"`
DefaultGateway string `yaml:"defaultGateway"`
PrimaryDNS string `yaml:"primaryDNS"`
SecondaryDNS string `yaml:"secondaryDNS"`
Authentication string `yaml:"authentication"`
IEEE8021x IEEE8021x `yaml:"ieee8021x"`
DHCPEnabled bool `yaml:"dhcpEnabled"`
IPSyncEnabled bool `yaml:"ipSyncEnabled"`
SharedStaticIP bool `yaml:"sharedStaticIP"`
IPAddress string `yaml:"ipAddress"`
SubnetMask string `yaml:"subnetMask"`
DefaultGateway string `yaml:"defaultGateway"`
PrimaryDNS string `yaml:"primaryDNS"`
SecondaryDNS string `yaml:"secondaryDNS"`
Authentication string `yaml:"authentication"`
IEEE8021x *IEEE8021x `yaml:"ieee8021x"`
}

type Wireless struct {
Profiles []WirelessProfile `yaml:"profiles"`
}

type WirelessProfile struct {
SSID string `yaml:"ssid"`
Password string `yaml:"password"`
AuthenticationMethod string `yaml:"authenticationMethod"`
EncryptionMethod string `yaml:"encryptionMethod"`
Priority int `yaml:"priority"`
IEEE8021x IEEE8021x `yaml:"ieee8021x"`
SSID string `yaml:"ssid"`
Password string `yaml:"password"`
AuthenticationMethod string `yaml:"authenticationMethod"`
EncryptionMethod string `yaml:"encryptionMethod"`
Priority int `yaml:"priority"`
IEEE8021x *IEEE8021x `yaml:"ieee8021x"`
}

type IEEE8021x struct {
Expand Down
3 changes: 2 additions & 1 deletion pkg/security/decrypt_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ var (
AuthenticationMethod: "WPA3 SAE",
EncryptionMethod: "CCMP",
Priority: 1,
IEEE8021x: config.IEEE8021x{
IEEE8021x: &config.IEEE8021x{
AuthenticationProtocol: 0,
Username: "",
Password: "",
Expand Down Expand Up @@ -229,6 +229,7 @@ func TestReadAndDecryptFile(t *testing.T) {
cryptor := Crypto{
EncryptionKey: test.key,
}

_, err := cryptor.ReadAndDecryptFile(test.filePath)

if !test.expectedError.InvalidKeySizeError && !test.expectedError.AuthenticationError && !test.expectedError.NewCipherError && !test.expectedError.Base64Error && !test.expectedError.FileReadError {
Expand Down
2 changes: 1 addition & 1 deletion pkg/security/testing/encryptedConfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
bwt4bpq8STTYnMagG6xYtW/HUTSlBk08WMX4YvxhiPqHuPi2hAkIm+bZkxyYA3l0MAEVpXco/qBRNSDBBJVeWocqzQtOkikcyNIcIVncDy1wuglwlReSjo96P18412PWC3hvdj9ckufTCiZkQt279cDXbgaVVO05PhdLRqiEXwPdiiFZIpPqhUpPpDNBDSEDTs+o20zGosr0ju8awc0HSHTf7k9IoqvD1tKlOl8oKqQMmMpJOmuWHDCqflutb1e1R22kau83oLgvCR3sVG+VznoPMNrcl/BUGwQr0SFkEFTNaVqKjI7K7NRRRdZNOncDALIVu8nfEqIcnqI/Nu8nZg3lxX+klC0eVS3rJb3AF0sdpg4EMAQqkKFC+ULPAbQ6PuwJk4Mds+tTc7bjanR/QSZCx4EzcD40DmVwyaUO0g+qAuLLjDBPVW5trgZ5xKdaeBeOqCZnQNu2+oQFDvrWaGzven2U/fVByOoWWyLRLDgknooAfTdRSb/nblsTgkVwqv13Xr2pQUsCoh6vmSCyK3S217F4nMuXG3Xcl/1LjnTTTv7WZdsBXsI+LRW2yI6mjNZLGQAvhcGhX1LulRo/JrMgzEAFKuXGSPlWlOmfIOmkNha6XaxLTJTfiwmakafdatcGJN7smw3sowL6SICLqN+oJvtFHUm78f8RhggJ67yEQs/K8JACTc4qk4eJ+yaL9mso8A8DjN4QKOKpwpEICjeJ7jfy6ev7SHE8CXaxJOyViHGYQdwtv072SXcf9QO3ZmLNekdBk0AfOrPQG2sDmxlfe3ByatYQKt4RK4/zv0HhlHHViTVa8rweJE1b3PuzbSKt4rsexQ97UsaFMKz+gS2fuioqNhyRDyKXy6SQHbQhoPCPGUWozcx+U3feEUQ6lmbbssGGXWufrfc4W4mwJHpyE9qSMfGbwHp2/hM1Z94AIuRXfS30/L28dK+iYnpfXlrXdh+3eK4hyQ9E/g02okRA8Xh11QdQMlZ6fR9oWz+ldCwH6yqBRZKcCnMfmdDHKP/wJ35qc8y1toJJQqaSZtXYFD5OzcklTjd5U5CuD5C5LQKpoqzvlf56ZhIzroxW+KoHjV8vFyS4S6nvQZMYZ3q78t49wd7W5QcqXDEBrZHzRHkrdDJQWNc/xEhL20bJC7A61lZO9+DFlbJH0Or3Zi0fg2ilSG44I7W0UM3E2XyLzlsuJMe64CLjSqvHu6FZUplRa903jPDCSqznlw0kVWMGxfdw18kSaMgzpAB048zN4CdZm7aC3OjVQtAlhk67o8hh93q8hwxgvNiv7c0Ktigi5cAh/Jg90o8Gybq5jhL8RhXn2WpvA62od9l2lkAU9gKWg2w6U0Vsrf1rjZe9HQ/nP8PFUq1KFpDLyfYLDA01qu8xwu5Dfy3HDttGFluZ8H5BaDUfzyJ2EmlmwNKYsgISBN9ii2qNVb6tGRYM13r6BF0ctbTDFWXzabCeNC7+7LS76e/XLJXYob9QhPBffBceRpeEMWZK7lpxJf9MFRX1by8sY7oNnM6HtL9mjGgDvCkIHw2bzivGlQ6hBDIpfwjH6ITEFahm1hF0degk1iw0iXR4NHvCHCMdPGEjw+mgWPYz5vSBQnGbb7icz9mDx4dOXGga5VafdScdSBtBNVrZmTFKwIGdXkq9vEiu6kroa+jsYqUhy0UASMfUHcZYCS3utqCzAqpBIhznc4MLmmAwWl+q6YRXxSE8ox+z03ufZGwqORUZGrwWRkf3S5RtMg1Rgl70ev9Lz55ymhBaMTNKDRpDOO2uOPrAIT7PF1v8Bws7VTKz7WWATB5prWCgNPyJOf40NKKDRJy7guZUexTDqoEJmkaOSEq/YOhfDLHr7QswHnl87pK+Q5oHZdsMIof7SWFELdK3rRb5K/4fIEcPFXfN5LF/hVV/F1M7ZDjLFkpVu6ET/s9QDW6Ir91dCM7mLJYzQgzxs3r2emFAah8gYHOI8XDGx7fUYLBI9C62xYJWS9jUAgtAmA1Xk6ruSJahoxS/k18CmdG5mpa/YaYeD8hgPn9hGJ7X2p0vSwz5DivskEwbtVsDDOWpSEhhORc5QzycuoucvLBRauFstdLmVXcX+hf/+wt4O9kf9lKJHmY6h9MjgJqeX7J20aT0L5P/RkDgLNFv8HbYL968QDrtGkAEuLPXGLUJFHYsWZ6KWF7wSGm8lv6g3u1z/SmvE8xybra5vR2P05n1V9F46FPz6ztPFWQf0VGBRpJtthEHH813tS19r5RlF8b25anvTevbLKECHiU0WMQipfucXtlUqt/3ozsliJf5lRoov88RoFiTz1nk2YgNwRaSYamdlBWZGH9jeRH4AGxgt1YvEjjYIs7SR2ODef+Hgg7W4BzwPJQ4mQDt4L0LMIgGSzXIKt2qchfrnKroivXS3dtljAio/ThL2EekkECrg8jfhGIicQ==
toR+cA/sbE6ljAGiFSLzvLBBxdJ9zUPqyK39Y93aB/1KT7IIYXRaC0NInFaGOV+lIEDm6OLw70huHWXpFSToeSGWjjKsexUAT7g16DtH60+klUh1tPkp3Cet0UamNBdMZp/hewXnSxH4uf7Ix1ubGTmyUmk10gPhG/thj5rfbXxLNSTCsLybtf7V2/51Nu10TwqGUXGwFFIrN4fYU0/PkxyP6Pbs2LZDxLU3qAsrw5DaqkjSIvzNtUiaHsyBQxtm8X6yrHhZIBRSqolilghN68+Ju1j9tFZfuzAWDuceUzl4dXG+ZGkpq/T5uS3hp21uzRXseVqMx+1trCjRMflJXbyYIKqXeWmQkeeg3VoHU9QP+XCEDHH7LOvktYtkkegmULjv0sVUH+2sZI3Hm54WdQRctprOBn5S3EZ2orrxECcv9ZSl7+1+kDeLAHPNSL8jNcYqnmImhZZrHZGNwNhoquPMyYMtBftovn/CX49G3mqebIJajBdKJ9xFK/2A4L6rzhSheAJ/08nXwdvxoEXpMVFCNRDlWrZZqkBvgmWnwTspXPtOPjnFaOiNFm0FitDM8bDaYrJUYW6/AjPnQ7kVO25UOXBhR2uJC35Xax7JU7f13h5lT2GHHG6Re8X9hOhjXcLK+yfZacAkwy9L+yykh3i6mKSdw96ytcTHyHGn6OAj8ldRf+87xE2x4RwXEaChWcS9c7EzV3e2owCcWXFus6C+a3UxGNG2Cd4w9hl/B7dDfWYuGJpPF2cqxLg55WhwavJjAxF1+OYoQO1Y/ml6a8vvLzM9V/gFKGu3lLJMXvk5Ll2wZCUuhrqZ2ESj4LB9nJHVId2NPgPsKWmIV4lPYfSq0FEoYhFgan0kx3uK/89CCTf8FxrGtvElN9lzgZk0dEfQg164B3OgqDpW2iQ7KOeV3k43PQW3SozAuX34OL6MjgtAzW0yx5fqYd6OmW2dcJ83sU+ZfR3sxza4Dgh0m+FEQJRJ+TJGBg3d0ntGYmzVB5wG64PfVUq1Q6IEz7S1438LzWtgbDzMJShY0Hr5mxzfWW6XfCs2gQt0lyR5DP/wQ5BQHoGixRdGVqERWiM9dtcROMF7xpGU/beDv5yc3MBoO8BKwO7B6aF4+xx8Wq7s+LjRlyu6xVVJ1oC9nQUgiYSmzoKTjrTMWHq6jvz/HsCJePLEJNwabPJwGgPSF8wqJ/ef24IPsOB02KLyHmJ14myycDilsPrlfr6+sXXdQj3rrDjsGr/ThFxU44cz9TPVoE2QzJ0sFA4yE5uD4MmSWedC5kg4n2gZprTKy5YnSqTqiHvvArudh2PtZ9jULi1ii+VgomBOYpEfvRCEY6flewGpUro+dQOzRty4xAEvWStT3TlUZPN7DonKdQ6SnbAnba6LuX3ro7Wp9vXs8nrXtfYPUP8Y41LuV9IgcttQ1rOlROkwQ51girqlXHBN8KvCCvkWHAwFgpOt1J/DMDB9bPRWancl3VI9wn76v9pNHU6Ui57pHKZmrO7hN1JRQviVM70amcot7O9xGvs8KOPlwEWfZG4gZq+s7r7qcV/gNd7Gd1TyOCX1HdMXAHUva0aNq50CcNrFZWFt73o2pAo0ZiRKcS3fabvUpsve0yKwGr52UHymfFsMoBoJORfflbaDE5yEArLb8iIoKS33mR+57WG39Oc108nrF6wRCVE6LzFBj+CM+vU9AJoK6wp+I/OGc/iMP3yKFiXTlB10gETkbfGNURM1Ng/IGPP7gLy9e7OM6ekiKCybbU9nYc3I6+tfVgJNvhqpsBrWlXjYo6iktiaaqjBaMBOmfMTjB7qanpzTb0dGsUyllF5UKRqshVQLTfOA8DAaxYFxpMD9r7qU1bKisRN9tiByWFyPAE4LbgxEUAJ9LbRU4W4a1SOxz0jdkwajzNR5+r6fMhvHyN9xIzWwYTUqUbKSmIVn7Fd0KNNbu8UKiMiTVeCYod9ES2C2sI6665L2+7hAMoocYzmOFCGsD8sH1XPHPH+PoiLRqd9pHY2CHlwc+CqvGa+H1xODVtgp0AhqlK2zpaugQiF1zZG02dyW3utsEU1P1WpDq82OIU7WzVfGfkkhKioTzPkYKnrByzj0px9k+ezW6yq11G6aZM/CevwVNr66cAR8lblwbyDOFWvK0EIHeinZE80EPxL/B4mZMi+ryJxepPZIlE7pM8bYxBpP2wikJfR7e+dUQsppFqRhL36QfTg1t5UuwlAaU7Hyawq5LG7PewzB8tkRVHC+Z331USl/bQAZvFdxYBHBlQ==
Loading