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

Jump to bottom

Implement 802.1x (EAP) in network settings #1597

Merged
merged 2 commits into from
Sep 10, 2024
Merged

Implement 802.1x (EAP) in network settings #1597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f96b94
Implement 8021x (EAP) in network settings
jcronenberg Sep 9, 2024
64d672f
Update changes file
jcronenberg Sep 10, 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
84 changes: 84 additions & 0 deletions rust/agama-lib/share/profile.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,90 @@
}
}
}
},
"ieee-8021x": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be great to describe each element of this section. For instance, ca_cert is described but identity is not.

"type": "object",
"title": "IEEE 802.1x (EAP) settings",
"properties": {
"eap": {
"type": "array",
"items": {
"title": "List of EAP methods used",
"type": "string",
"enum": [
"leap",
"md5",
"tls",
"peap",
"ttls",
"pwd",
"fast"
]
}
},
"phase2_auth": {
"title": "Phase 2 inner auth method",
"type": "string",
"enum": [
"pap",
"chap",
"mschap",
"mschapv2",
"gtc",
"otp",
"md5",
"tls"
]
},
"identity": {
"title": "Identity string, often for example the user's login name",
"type": "string"
},
"password": {
"title": "Password string used for EAP authentication",
"type": "string"
},
"ca_cert": {
"title": "Path to CA certificate",
"type": "string"
},
"ca_cert_password": {
"title": "Password string for CA certificate if it is encrypted",
"type": "string"
},
"client_cert": {
"title": "Path to client certificate",
"type": "string"
},
"client_cert_password": {
"title": "Password string for client certificate if it is encrypted",
"type": "string"
},
"private_key": {
"title": "Path to private key",
"type": "string"
},
"private_key_password": {
"title": "Password string for private key if it is encrypted",
"type": "string"
},
"anonymous_identity": {
"title": "Anonymous identity string for EAP authentication methods",
"type": "string"
},
"peap_version": {
"title": "Which PEAP version is used when PEAP is set as the EAP method in the 'eap' property",
"type": "string",
"enum": [
"0",
"1"
]
},
"peap_label": {
"title": "Force the use of the new PEAP label during key derivation",
"type": "boolean"
}
}
}
}
}
Expand Down
46 changes: 46 additions & 0 deletions rust/agama-lib/src/network/settings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,50 @@ impl Default for BondSettings {
}
}

/// IEEE 802.1x (EAP) settings
#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct IEEE8021XSettings {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, write some description. It will appear in our OpenAPI documentation.

/// List of EAP methods used
#[serde(skip_serializing_if = "Vec::is_empty", default)]
pub eap: Vec<String>,
/// Phase 2 inner auth method
#[serde(skip_serializing_if = "Option::is_none")]
pub phase2_auth: Option<String>,
/// Identity string, often for example the user's login name
#[serde(skip_serializing_if = "Option::is_none")]
pub identity: Option<String>,
/// Password string used for EAP authentication
#[serde(skip_serializing_if = "Option::is_none")]
pub password: Option<String>,
/// Path to CA certificate
#[serde(skip_serializing_if = "Option::is_none")]
pub ca_cert: Option<String>,
/// Password string for CA certificate if it is encrypted
#[serde(skip_serializing_if = "Option::is_none")]
pub ca_cert_password: Option<String>,
/// Path to client certificate
#[serde(skip_serializing_if = "Option::is_none")]
pub client_cert: Option<String>,
/// Password string for client certificate if it is encrypted
#[serde(skip_serializing_if = "Option::is_none")]
pub client_cert_password: Option<String>,
/// Path to private key
#[serde(skip_serializing_if = "Option::is_none")]
pub private_key: Option<String>,
/// Password string for private key if it is encrypted
#[serde(skip_serializing_if = "Option::is_none")]
pub private_key_password: Option<String>,
/// Anonymous identity string for EAP authentication methods
#[serde(skip_serializing_if = "Option::is_none")]
pub anonymous_identity: Option<String>,
/// Which PEAP version is used when PEAP is set as the EAP method in the 'eap' property
#[serde(skip_serializing_if = "Option::is_none")]
pub peap_version: Option<String>,
/// Force the use of the new PEAP label during key derivation
#[serde(skip_serializing_if = "std::ops::Not::not")]
pub peap_label: bool,
}

#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct NetworkDevice {
pub id: String,
Expand Down Expand Up @@ -106,6 +150,8 @@ pub struct NetworkConnection {
pub status: Option<Status>,
#[serde(skip_serializing_if = "is_zero", default)]
pub mtu: u32,
#[serde(rename = "ieee-8021x", skip_serializing_if = "Option::is_none")]
pub ieee_8021x: Option<IEEE8021XSettings>,
}

fn is_zero(u: &u32) -> bool {
Expand Down
4 changes: 4 additions & 0 deletions rust/agama-server/src/network/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ pub enum NetworkStateError {
InvalidWEPAuthAlg(String),
#[error("Invalid WEP key type: '{0}'")]
InvalidWEPKeyType(u32),
#[error("Invalid EAP method: '{0}'")]
InvalidEAPMethod(String),
#[error("Invalid phase2 authentication method: '{0}'")]
InvalidPhase2AuthMethod(String),
}

impl From<NetworkStateError> for zbus::fdo::Error {
Expand Down
Loading