Skip to content

Commit e6410f4

Browse files
authored
Merge branch 'main' into user-disable
2 parents fed3921 + b0c5187 commit e6410f4

File tree

7 files changed

+45
-21
lines changed

7 files changed

+45
-21
lines changed

Cargo.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

debian/control

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Build-Depends: debhelper-compat (= 13),
2323
protobuf-compiler,
2424
Standards-Version: 4.6.2
2525
XS-Go-Import-Path: github.com/ubuntu/authd
26-
XS-Vendored-Sources-Rust: [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected]
26+
XS-Vendored-Sources-Rust: [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected]
2727
Homepage: https://github.com/ubuntu/authd
2828
Vcs-Browser: https://github.com/ubuntu/authd
2929
Vcs-Git: https://github.com/ubuntu/authd.git

docs/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@
210210
# NOTE: By default, the following MyST extensions are enabled:
211211
# substitution, deflist, linkify
212212

213-
# myst_enable_extensions = set()
213+
myst_enable_extensions = set({"colon_fence"})
214214

215215

216216
# Auto-generate header anchors

docs/howto/install-authd.md

+36-10
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,60 @@
11
# Installation
22

33
This project consists of two components:
4-
* authd: The authentication daemon responsible for managing access to the authentication mechanism.
5-
* an identity broker: The services that handle the interface with an identity provider. There can be several identity brokers installed and enabled on the system.
4+
* **authd**: The authentication daemon responsible for managing access to the authentication mechanism.
5+
* **identity broker**: The services that handle the interface with an identity provider. There can be several identity brokers installed and enabled on the system.
66

7-
authd is delivered as a Debian package.
7+
authd is delivered as a Debian package for Ubuntu Desktop and Ubuntu Server.
88

99
## System requirements
1010

1111
* Distribution: Ubuntu Desktop 24.04 LTS or Ubuntu Server 24.04 LTS
1212
* Architectures: amd64, arm64
1313

14+
## Install authd
1415

15-
```{note}
16-
While this project is in active development, a version for Ubuntu 24.04 is available from the [authd testing PPA](https://launchpad.net/~ubuntu-enterprise-desktop/+archive/ubuntu/authd). <br />
16+
You can install authd from the [stable PPA](https://launchpad.net/~ubuntu-enterprise-desktop/+archive/ubuntu/authd).
1717

18-
You can add this PPA to your system's software sources with the following commands:
18+
To add this PPA to your system's software sources, run the following commands:
1919

2020
```shell
2121
sudo add-apt-repository ppa:ubuntu-enterprise-desktop/authd
2222
sudo apt update
2323
```
2424

25-
Install the following Debian packages (note that `gnome-shell` and `yaru-theme*` are only required for desktop integration, server installations may ignore them):
25+
```{note}
26+
The stable PPA release of authd can be used today as an authentication service.
27+
This project is under active development and the release of authd to the
28+
official archive is planned for Ubuntu 26.04 LTS.
29+
```
30+
31+
Then install authd and any additional Debian packages needed for your system of
32+
choice:
33+
34+
:::::{tab-set}
35+
:sync-group: system
36+
37+
::::{tab-item} Ubuntu Desktop
38+
:sync: desktop
2639

2740
```shell
2841
sudo apt install authd gnome-shell yaru-theme-gnome-shell
2942
```
43+
::::
44+
45+
::::{tab-item} Ubuntu Server
46+
:sync: server
47+
48+
```shell
49+
sudo apt install authd
50+
```
51+
::::
52+
:::::
3053

3154
## Install brokers
3255

33-
The brokers are provided as Snap packages and available from the Snap Store.
56+
The brokers are provided as Snap packages and are available from the Snap
57+
Store.
3458

3559
### MS Entra ID broker
3660

@@ -40,7 +64,8 @@ To install the MS Entra ID broker, run the following command:
4064
sudo snap install authd-msentraid
4165
```
4266

43-
At this stage, you have installed the main service and an identity broker to authenticate against Microsoft Entra ID.
67+
At this stage, you have installed the main service and an identity broker to
68+
authenticate against Microsoft Entra ID.
4469

4570
### Google IAM broker
4671

@@ -50,4 +75,5 @@ To install the Google IAM broker, run the following command:
5075
sudo snap install authd-google
5176
```
5277

53-
At this stage, you have installed the main service and an identity broker to authenticate against Google IAM.
78+
At this stage, you have installed the main service and an identity broker to
79+
authenticate against Google IAM.

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/ubuntu/authd
22

33
go 1.23.0
44

5-
toolchain go1.23.5
5+
toolchain go1.23.6
66

77
require (
88
github.com/charmbracelet/bubbles v0.20.0

internal/users/manager.go

+3-5
Original file line numberDiff line numberDiff line change
@@ -366,9 +366,8 @@ func (m *Manager) UserByID(uid uint32) (types.UserEntry, error) {
366366

367367
// AllUsers returns all users.
368368
func (m *Manager) AllUsers() ([]types.UserEntry, error) {
369-
// TODO: I'm not sure if we should return temporary users here. On the one hand, they are usually not interesting to
370-
// the user and would clutter the output of `getent passwd`. On the other hand, it might be surprising that some
371-
// users are not returned by `getent passwd` and some apps might rely on all users being returned.
369+
// We don't return temporary users here, because they are not interesting to the user and would clutter the output
370+
// of `getent passwd`. Other tools should check `getpwnam`/`getpwuid` to check for conflicts, like `useradd` does.
372371
usrs, err := m.cache.AllUsers()
373372
if err != nil {
374373
return nil, err
@@ -409,7 +408,7 @@ func (m *Manager) GroupByID(gid uint32) (types.GroupEntry, error) {
409408

410409
// AllGroups returns all groups.
411410
func (m *Manager) AllGroups() ([]types.GroupEntry, error) {
412-
// TODO: Same as for AllUsers, we might want to return temporary groups here.
411+
// Same as in AllUsers, we don't return temporary groups here.
413412
grps, err := m.cache.AllGroups()
414413
if err != nil {
415414
return nil, err
@@ -433,7 +432,6 @@ func (m *Manager) ShadowByName(username string) (types.ShadowEntry, error) {
433432

434433
// AllShadows returns all shadow entries.
435434
func (m *Manager) AllShadows() ([]types.ShadowEntry, error) {
436-
// TODO: Even less sure if we should return temporary users here.
437435
usrs, err := m.cache.AllUsers()
438436
if err != nil {
439437
return nil, err

nss/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ hyper-util = "0.1.10"
3333
[build-dependencies]
3434
# We need to pin tonic-build to 0.11.* for now until https://github.com/hyperium/tonic/issues/1909 is fixed.
3535
tonic-build = "0.11.*"
36-
cc = "1.2.10"
36+
cc = "1.2.12"

0 commit comments

Comments
 (0)