Skip to content

Add additional wireless settings#1602

Merged
imobachgs merged 4 commits intoagama-project:masterfrom
jcronenberg:additional_wireless_settings
Sep 13, 2024
Merged

Add additional wireless settings#1602
imobachgs merged 4 commits intoagama-project:masterfrom
jcronenberg:additional_wireless_settings

Conversation

@jcronenberg
Copy link
Copy Markdown
Contributor

@jcronenberg jcronenberg commented Sep 13, 2024 •
edited
Loading

Problem

Network model was missing some required fields for the wicked migration.

Solution

Added the required fields to both the model and settings. I've also added some fields present in the model to be available via the settings.

Testing

  • Extended existing unit tests
  • Tested manually
sudo agama auth login && AGAMA_TOKEN=`sudo agama auth show`
curl http://localhost/api/network/connections \
    -H "Content-Type: application/json" \
    -H "Authorization: Bearer $AGAMA_TOKEN" \
    -d '{ "id": "wifi", "method4": "auto", "method6": "auto", "ignoreAutoDns": false, "wireless": { "security": "wpa-psk", "ssid": "test-ssid", "mode": "infrastructure", "groupAlgorithms": [ "wep40", "wep104" ], "pairwiseAlgorithms": [ "tkip", "ccmp" ], "wpaProtocolVersions": [ "wpa" ], "pmf": 2, "hidden": true, "band": "a", "channel": 100, "bssid": "12:34:56:78:9A:BC" }, "status": "down" }'
curl -X POST http://localhost/api/network/system/apply \
    -H "Content-Type: application/json" \
    -H "Authorization: Bearer $AGAMA_TOKEN"
nmcli con show wifi
# See relevant fields in 802-11-wireless.* and 802-11-wireless-security.* set.

imobachgs
imobachgs reviewed Sep 13, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@imobachgs imobachgs left a comment

Choose a reason for hiding this comment

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

In general it looks good, just a few comments. Thanks!

rust/agama-lib/share/profile.schema.json Outdated
]
},
"hidden": {
"title": "Indicates that the wifi network is not broadcasting it's SSID",
Copy link
Copy Markdown
Contributor

@imobachgs imobachgs Sep 13, 2024

Choose a reason for hiding this comment

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

Should it be "wifi", "Wi-Fi", wireless... In this schema we have been using "wireless" but we can change it. Just for consistency.

Copy link
Copy Markdown
Contributor Author

@jcronenberg jcronenberg Sep 13, 2024

Choose a reason for hiding this comment

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

I think wireless is fine. I changed the descriptions accordingly.

Copy link
Copy Markdown
Contributor

@imobachgs imobachgs Sep 13, 2024

Choose a reason for hiding this comment

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

OK, we will plan for that.

rust/agama-server/src/network/model.rs
#[error("Invalid group algorithm: {0}")]
pub struct InvalidGroupAlgorithm(String);

impl FromStr for GroupAlgorithm {
Copy link
Copy Markdown
Contributor

@imobachgs imobachgs Sep 13, 2024

Choose a reason for hiding this comment

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

For some time, I have been thinking whether we should use strum (see the EnumString example) to avoid all those trivial conversions.

I am not sure about how error handle would be, but I think it is worth having a closer look.

In any case, it is out of the scope of this PR.

Copy link
Copy Markdown
Contributor Author

@jcronenberg jcronenberg Sep 13, 2024

Choose a reason for hiding this comment

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

Totally agree, strum would make this a lot simpler 🙂

rust/agama-server/src/network/nm/dbus.rs
let group_algorithms: Vec<GroupAlgorithm> = group_algorithms
.get()
.iter()
.map(|x| x.downcast_ref::<str>().unwrap())
Copy link
Copy Markdown
Contributor

@imobachgs imobachgs Sep 13, 2024

Choose a reason for hiding this comment

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

Those unwraps are dangerous because is something goes wrong, the whole service would go down. Perhaps you might want to split this chain into smaller functions.

Copy link
Copy Markdown
Contributor Author

@jcronenberg jcronenberg Sep 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

This is the testing code. The code for the service does use the proper error handling.

Copy link
Copy Markdown
Contributor

@imobachgs imobachgs Sep 13, 2024

Choose a reason for hiding this comment

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

Ouch, Friday afternoon, you know 😅

imobachgs
imobachgs approved these changes Sep 13, 2024
View reviewed changes
rust/agama-server/src/network/nm/dbus.rs
let group_algorithms: Vec<GroupAlgorithm> = group_algorithms
.get()
.iter()
.map(|x| x.downcast_ref::<str>().unwrap())
Copy link
Copy Markdown
Contributor

@imobachgs imobachgs Sep 13, 2024

Choose a reason for hiding this comment

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

Ouch, Friday afternoon, you know 😅

@imobachgs imobachgs merged commit af3c4f6 into agama-project:master Sep 13, 2024
@jcronenberg jcronenberg deleted the additional_wireless_settings branch September 16, 2024 08:50
@imobachgs imobachgs mentioned this pull request Sep 20, 2024
Merged
imobachgs added a commit that referenced this pull request Sep 20, 2024
@imobachgs
Update to release 10 (#1622)
574a1a5 
Prepare for releasing Agama 10·

* #1263
* #1330
* #1407
* #1408
* #1410
* #1411
* #1412
* #1416
* #1417
* #1419
* #1420
* #1421
* #1422
* #1423
* #1424
* #1425
* #1428
* #1429
* #1430
* #1431
* #1432
* #1433
* #1436
* #1437
* #1438
* #1439
* #1440
* #1441
* #1443
* #1444
* #1445
* #1449
* #1450
* #1451
* #1452
* #1453
* #1454
* #1455
* #1456
* #1457
* #1459
* #1460
* #1462
* #1464
* #1465
* #1466
* #1467
* #1468
* #1469
* #1470
* #1471
* #1472
* #1473
* #1475
* #1476
* #1477
* #1478
* #1479
* #1480
* #1481
* #1482
* #1483
* #1484
* #1485
* #1486
* #1487
* #1488
* #1489
* #1491
* #1492
* #1493
* #1494
* #1496
* #1497
* #1498
* #1499
* #1500
* #1501
* #1502
* #1503
* #1504
* #1505
* #1506
* #1507
* #1508
* #1510
* #1511
* #1512
* #1513
* #1514
* #1515
* #1516
* #1517
* #1518
* #1519
* #1520
* #1522
* #1523
* #1524
* #1525
* #1526
* #1527
* #1528
* #1529
* #1530
* #1531
* #1532
* #1533
* #1534
* #1535
* #1536
* #1537
* #1540
* #1541
* #1543
* #1544
* #1545
* #1546
* #1547
* #1548
* #1549
* #1550
* #1552
* #1553
* #1554
* #1555
* #1556
* #1557
* #1558
* #1559
* #1560
* #1562
* #1563
* #1565
* #1566
* #1567
* #1568
* #1569
* #1570
* #1571
* #1572
* #1573
* #1574
* #1575
* #1576
* #1577
* #1578
* #1579
* #1580
* #1581
* #1583
* #1584
* #1585
* #1586
* #1587
* #1588
* #1589
* #1590
* #1591
* #1592
* #1593
* #1596
* #1597
* #1598
* #1600
* #1602
* #1605
* #1606
* #1607
* #1608
* #1610
* #1611
* #1612
* #1613
* #1614
* #1619
* #1620
* #1621
bmwiedemann pushed a commit to bmwiedemann/openSUSE that referenced this pull request Sep 23, 2024
@bmwiedemann
Update agama to version 0 / rev 6 via SR 1202589
fe29b8c 
https://build.opensuse.org/request/show/1202589
by user IGonzalezSosa + anag+factory
- Version 10

- Change the license to GPL-2.0-or-later (gh#agama-project/agama#1621).

- Expose the zFCP D-Bus API through HTTP (gh#agama-project/agama#1570).

- For CLI, use HTTP clients instead of D-Bus clients,
  final piece: Storage (gh#agama-project/agama#1600)
  - added StorageHTTPClient

- Add additional wireless settings (gh#agama-project/agama#1602).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@imobachgs imobachgs imobachgs approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@jcronenberg @imobachgs