Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3da77ab3d6 | ||
|
|
958266d36c | ||
|
|
63f5e57685 | ||
|
|
50c555c5ea | ||
|
|
f35d168ff3 | ||
|
|
cb14a30a15 | ||
|
|
ed094e11ec | ||
|
|
305912e467 | ||
|
|
fd01b234e3 | ||
|
|
9c10d7ee2c | ||
|
|
bc9385d15c | ||
|
|
637ccae0b4 | ||
|
|
169f9abb6b | ||
|
|
54a251bcea | ||
|
|
2220f72321 | ||
|
|
d62be1da45 | ||
|
|
f7422b7812 | ||
|
|
fc9b527dee | ||
|
|
4746329409 | ||
|
|
3f874eece9 | ||
|
|
f16b6e3e0a | ||
|
|
37b433d4a7 | ||
|
|
0b870694f6 | ||
|
|
b13b8fbb47 | ||
|
|
4b1c5a5a83 | ||
|
|
cb351476ed |
No files matched your search
@@ -16,6 +16,7 @@ Developers:
|
|||||||
Alexander Bokovoy
|
Alexander Bokovoy
|
||||||
Alexander Koksharov
|
Alexander Koksharov
|
||||||
Alexander Scheel
|
Alexander Scheel
|
||||||
|
Alexandra Nikandrova
|
||||||
Alexandre Mulatinho
|
Alexandre Mulatinho
|
||||||
Alexey Slaykovsky
|
Alexey Slaykovsky
|
||||||
Alexey Tikhonov
|
Alexey Tikhonov
|
||||||
|
|||||||
+1
-1
@@ -49,7 +49,7 @@ define(IPA_VERSION_PRE_RELEASE, )
|
|||||||
# This option works only with GNU m4: #
|
# This option works only with GNU m4: #
|
||||||
# it requires esyscmd m4 macro. #
|
# it requires esyscmd m4 macro. #
|
||||||
########################################################
|
########################################################
|
||||||
define(IPA_VERSION_IS_GIT_SNAPSHOT, yes)
|
define(IPA_VERSION_IS_GIT_SNAPSHOT, no)
|
||||||
|
|
||||||
########################################################
|
########################################################
|
||||||
# git development branch: #
|
# git development branch: #
|
||||||
|
|||||||
@@ -494,7 +494,7 @@ init_with_password(const char *name, const char *password)
|
|||||||
|
|
||||||
done:
|
done:
|
||||||
if (service_creds != GSS_C_NO_CREDENTIAL)
|
if (service_creds != GSS_C_NO_CREDENTIAL)
|
||||||
gss_release_cred(&min, &client_creds);
|
gss_release_cred(&min, &service_creds);
|
||||||
|
|
||||||
if (client_creds != GSS_C_NO_CREDENTIAL)
|
if (client_creds != GSS_C_NO_CREDENTIAL)
|
||||||
gss_release_cred(&min, &client_creds);
|
gss_release_cred(&min, &client_creds);
|
||||||
|
|||||||
@@ -1839,6 +1839,9 @@ krb5_error_code ipadb_get_principal(krb5_context kcontext,
|
|||||||
kerr = krb5_dbe_set_string(kcontext, *entry,
|
kerr = krb5_dbe_set_string(kcontext, *entry,
|
||||||
KRB5_KDB_SK_PAC_PRIVSVR_ENCTYPE,
|
KRB5_KDB_SK_PAC_PRIVSVR_ENCTYPE,
|
||||||
"aes256-sha1");
|
"aes256-sha1");
|
||||||
|
if (kerr)
|
||||||
|
return kerr;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* We should have been initialized at this point already */
|
/* We should have been initialized at this point already */
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ else:
|
|||||||
This will connect to LDAP directly if we are running our script in server, or
|
This will connect to LDAP directly if we are running our script in server, or
|
||||||
use a RPC client if we are running it from a FreeIPA client.
|
use a RPC client if we are running it from a FreeIPA client.
|
||||||
|
|
||||||
After we have initialized the API and stablished a connection, we are ready to
|
After we have initialized the API and established a connection, we are ready to
|
||||||
issue commands.
|
issue commands.
|
||||||
|
|
||||||
## Running commands
|
## Running commands
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
..
|
.. _1-server-install:
|
||||||
|
|
||||||
Copyright 2015-2018 Red Hat, Inc.
|
Copyright 2015-2018 Red Hat, Inc.
|
||||||
|
|
||||||
This work is licensed under the Creative Commons Attribution 4.0
|
This work is licensed under the Creative Commons Attribution 4.0
|
||||||
@@ -157,8 +158,8 @@ more!
|
|||||||
|
|
||||||
To prepare for the next unit, exit the ``server`` SSH session (but
|
To prepare for the next unit, exit the ``server`` SSH session (but
|
||||||
do not shut the VM down). The next essential unit is
|
do not shut the VM down). The next essential unit is
|
||||||
`Unit 2: Enrolling client machines <2-client-install.rst>`_.
|
:ref:`Unit 2: Enrolling client machines <2-client-install>`.
|
||||||
|
|
||||||
Alternatively, if you would like to immediately install a replica
|
Alternatively, if you would like to immediately install a replica
|
||||||
server (essential for production deployments), you can take a detour
|
server (essential for production deployments), you can take a detour
|
||||||
to `Unit 7: Replica installation <7-replica-install.rst>`_.
|
to :ref:`Unit 7: Replica installation <7-replica-install>`.
|
||||||
@@ -1,9 +1,11 @@
|
|||||||
|
.. _10-ssh-key-management:
|
||||||
|
|
||||||
Unit 10: SSH user and host key management
|
Unit 10: SSH user and host key management
|
||||||
=========================================
|
=========================================
|
||||||
|
|
||||||
**Prerequisites:**
|
**Prerequisites:**
|
||||||
|
|
||||||
- `Unit 3: User management and Kerberos authentication <3-user-management.rst>`_
|
- :ref:`Unit 3: User management and Kerberos authentication <3-user-management>`
|
||||||
|
|
||||||
In this module you will explore how to use FreeIPA as a backend
|
In this module you will explore how to use FreeIPA as a backend
|
||||||
provider for SSH keys. Instead of distributing ``authorized_keys``
|
provider for SSH keys. Instead of distributing ``authorized_keys``
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
|
.. _11-kerberos-ticket-policy:
|
||||||
|
|
||||||
Unit 11: Kerberos ticket policy
|
Unit 11: Kerberos ticket policy
|
||||||
=========================================
|
=========================================
|
||||||
|
|
||||||
**Prerequisites:**
|
**Prerequisites:**
|
||||||
|
|
||||||
- `Unit 3: User management and Kerberos authentication <3-user-management.rst>`_
|
- :ref:`Unit 3: User management and Kerberos authentication <3-user-management>`
|
||||||
|
|
||||||
In this module you will explore how to manage properties of Kerberos
|
In this module you will explore how to manage properties of Kerberos
|
||||||
authentication and authorization in FreeIPA.
|
authentication and authorization in FreeIPA.
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
|
.. _12-external-idp-support:
|
||||||
|
|
||||||
Unit 12: Authentication against external Identity Providers
|
Unit 12: Authentication against external Identity Providers
|
||||||
===========================================================
|
===========================================================
|
||||||
|
|
||||||
**Prerequisites:**
|
**Prerequisites:**
|
||||||
|
|
||||||
- `Unit 11: Kerberos ticket policy <11-kerberos-ticket-policy.rst>`_
|
- :ref:`Unit 11: Kerberos ticket policy <11-kerberos-ticket-policy>`
|
||||||
|
|
||||||
In this module you will explore how to manage use external OAuth 2.0 servers to
|
In this module you will explore how to manage use external OAuth 2.0 servers to
|
||||||
authorize issuance of Kerberos tickets in FreeIPA.
|
authorize issuance of Kerberos tickets in FreeIPA.
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
|
.. _2-client-install:
|
||||||
|
|
||||||
Unit 2: Enrolling client machines
|
Unit 2: Enrolling client machines
|
||||||
===================================
|
===================================
|
||||||
|
|
||||||
**Prerequisites**:
|
**Prerequisites**:
|
||||||
|
|
||||||
- `Unit 1: Installing the FreeIPA server <1-server-install.rst>`_
|
- :ref:`Unit 1: Installing the FreeIPA server <1-server-install>`
|
||||||
|
|
||||||
In this unit, you will enrol a *host* as a client of your FreeIPA
|
In this unit, you will enrol a *host* as a client of your FreeIPA
|
||||||
domain. This means that *users* in your FreeIPA realm (or Active
|
domain. This means that *users* in your FreeIPA realm (or Active
|
||||||
@@ -57,4 +59,4 @@ logged onto the host can also acquire Kerberos tickets for accessing
|
|||||||
*services* in your domain.
|
*services* in your domain.
|
||||||
|
|
||||||
You can now move on to
|
You can now move on to
|
||||||
`Unit 3: User management and Kerberos authentication <3-user-management.rst>`_.
|
:ref:`Unit 3: User management and Kerberos authentication <3-user-management>`.
|
||||||
@@ -1,3 +1,5 @@
|
|||||||
|
.. _3-user-management:
|
||||||
|
|
||||||
Unit 3: User management and Kerberos authentication
|
Unit 3: User management and Kerberos authentication
|
||||||
=====================================================
|
=====================================================
|
||||||
|
|
||||||
@@ -124,8 +126,8 @@ is a true *single sign-on* protocol!
|
|||||||
|
|
||||||
Now that you have created some users, it's time to define some
|
Now that you have created some users, it's time to define some
|
||||||
access policies. Proceed to
|
access policies. Proceed to
|
||||||
`Unit 4: Host-based access control (HBAC) <4-hbac.rst>`_.
|
:ref:`Unit 4: Host-based access control (HBAC) <4-hbac>`.
|
||||||
|
|
||||||
Alternatively, if you are interested in SSH public key management
|
Alternatively, if you are interested in SSH public key management
|
||||||
for users and hosts, jump ahead to
|
for users and hosts, jump ahead to
|
||||||
`Unit 10: SSH user and host key management <10-ssh-key-management.rst>`_.
|
:ref:`Unit 10: SSH user and host key management <10-ssh-key-management>`.
|
||||||
@@ -1,9 +1,11 @@
|
|||||||
|
.. _4-hbac:
|
||||||
|
|
||||||
Unit 4: Host-based access control (HBAC)
|
Unit 4: Host-based access control (HBAC)
|
||||||
==========================================
|
==========================================
|
||||||
|
|
||||||
**Prerequisites:**
|
**Prerequisites:**
|
||||||
|
|
||||||
- `Unit 3: User management and Kerberos authentication <3-user-management.rst>`_
|
- :ref:`Unit 3: User management and Kerberos authentication <3-user-management>`
|
||||||
|
|
||||||
FreeIPA's *host-based access control* (HBAC) feature allows you to
|
FreeIPA's *host-based access control* (HBAC) feature allows you to
|
||||||
define policies that restrict access to hosts or services based on
|
define policies that restrict access to hosts or services based on
|
||||||
@@ -142,7 +144,7 @@ Now try ``alice``::
|
|||||||
This was the final mandatory unit in the workshop. From here, there
|
This was the final mandatory unit in the workshop. From here, there
|
||||||
are several optional units you can choose from. You can proceed
|
are several optional units you can choose from. You can proceed
|
||||||
directly to
|
directly to
|
||||||
`Unit 5: Web application authentication and authorisation <5-web-app-authnz.rst>`_.
|
:ref:`Unit 5: Web application authentication and authorisation <5-web-app-authnz>`.
|
||||||
Otherwise,
|
Otherwise,
|
||||||
`return to the curriculum overview <workshop.rst#curriculum-overview>`_
|
:ref:`return to the curriculum overview <curriculum-overview>`
|
||||||
to see all the options.
|
to see all the options.
|
||||||
@@ -1,10 +1,12 @@
|
|||||||
|
.. _5-web-app-authnz:
|
||||||
|
|
||||||
Unit 5: Web application authentication and authorisation
|
Unit 5: Web application authentication and authorisation
|
||||||
==========================================================
|
==========================================================
|
||||||
|
|
||||||
**Prerequisites**:
|
**Prerequisites**:
|
||||||
|
|
||||||
- `Unit 3: User management and Kerberos authentication <3-user-management.rst>`_
|
- :ref:`Unit 3: User management and Kerberos authentication <3-user-management>`
|
||||||
- `Unit 4: Host-based access control (HBAC) <4-hbac.rst>`_
|
- :ref:`Unit 4: Host-based access control (HBAC) <4-hbac>`
|
||||||
|
|
||||||
You can configure many kinds of applications to rely on FreeIPA's
|
You can configure many kinds of applications to rely on FreeIPA's
|
||||||
centralised authentication, including web applications. In this
|
centralised authentication, including web applications. In this
|
||||||
@@ -309,4 +311,4 @@ authenticated as ``bob`` instead?
|
|||||||
This unit is now concluded. Now that you have mastered web app
|
This unit is now concluded. Now that you have mastered web app
|
||||||
authentication, you'll want to configure TLS for your site. Proceed
|
authentication, you'll want to configure TLS for your site. Proceed
|
||||||
to
|
to
|
||||||
`Unit 6: Service certificates <6-cert-management.rst>`_.
|
:ref:`Unit 6: Service certificates <6-cert-management>`.
|
||||||
@@ -1,3 +1,5 @@
|
|||||||
|
.. _6-cert-management:
|
||||||
|
|
||||||
Unit 6: Service certificates
|
Unit 6: Service certificates
|
||||||
================================
|
================================
|
||||||
|
|
||||||
@@ -126,9 +128,9 @@ Restart Apache and make a request to the app over HTTPS::
|
|||||||
|
|
||||||
|
|
||||||
You can now proceed to
|
You can now proceed to
|
||||||
`Unit 7: Replica installation <7-replica-install.rst>`_
|
:ref:`Unit 7: Replica installation <7-replica-install>`
|
||||||
or
|
or
|
||||||
`Unit 8: Sudo rule management <8-sudorule.rst>`_.
|
:ref:`Unit 8: Sudo rule management <8-sudorule>`.
|
||||||
Otherwise,
|
Otherwise,
|
||||||
`return to the curriculum overview <workshop.rst#curriculum-overview>`_
|
:ref:`return to the curriculum overview <curriculum-overview>`
|
||||||
to see all the options.
|
to see all the options.
|
||||||
@@ -1,9 +1,11 @@
|
|||||||
|
.. _7-replica-install:
|
||||||
|
|
||||||
Unit 7: Replica installation
|
Unit 7: Replica installation
|
||||||
==============================
|
==============================
|
||||||
|
|
||||||
**Prerequisites**:
|
**Prerequisites**:
|
||||||
|
|
||||||
- `Unit 1: Installing the FreeIPA server <1-server-install.rst>`_
|
- :ref:`Unit 1: Installing the FreeIPA server <1-server-install>`
|
||||||
|
|
||||||
FreeIPA is designed to be run in a replicated multi-master
|
FreeIPA is designed to be run in a replicated multi-master
|
||||||
environment. In this unit, we will install a replica of the
|
environment. In this unit, we will install a replica of the
|
||||||
@@ -19,7 +21,7 @@ Client installation
|
|||||||
|
|
||||||
The first step of replica creation is to enrol the machine that will
|
The first step of replica creation is to enrol the machine that will
|
||||||
become the replica. SSH to the ``replica`` VM and enrol it per
|
become the replica. SSH to the ``replica`` VM and enrol it per
|
||||||
`Unit 2: Enrolling client machines <2-client-install.rst>`_
|
:ref:`Unit 2: Enrolling client machines <2-client-install>`
|
||||||
|
|
||||||
Replica promotion
|
Replica promotion
|
||||||
-----------------
|
-----------------
|
||||||
@@ -56,7 +58,7 @@ After ``ipa-replica-install`` finishes, the replica is operational.
|
|||||||
LDAP changes on any server will be replicated to all other servers.
|
LDAP changes on any server will be replicated to all other servers.
|
||||||
|
|
||||||
You can proceed to
|
You can proceed to
|
||||||
`Unit 8: Sudo rule management <8-sudorule.rst>`_
|
:ref:`Unit 8: Sudo rule management <8-sudorule>`
|
||||||
or
|
or
|
||||||
`return to the curriculum overview <workshop.rst#curriculum-overview>`_
|
:ref:`return to the curriculum overview <curriculum-overview>`
|
||||||
to see all the available topics.
|
to see all the available topics.
|
||||||
@@ -1,10 +1,12 @@
|
|||||||
|
.. _8-sudorule:
|
||||||
|
|
||||||
Unit 8: Sudo rule management
|
Unit 8: Sudo rule management
|
||||||
============================
|
============================
|
||||||
|
|
||||||
**Prerequisites**:
|
**Prerequisites**:
|
||||||
|
|
||||||
- `Unit 3: User management and Kerberos authentication <3-user-management.rst>`_
|
- :ref:`Unit 3: User management and Kerberos authentication <3-user-management>`
|
||||||
- `Unit 4: Host-based access control (HBAC) <4-hbac.rst>`_
|
- :ref:`Unit 4: Host-based access control (HBAC) <4-hbac>`
|
||||||
|
|
||||||
Sudo is a program that allows users to run programs as another user
|
Sudo is a program that allows users to run programs as another user
|
||||||
with different privileges (possibly ``root``). Sudo rules provide
|
with different privileges (possibly ``root``). Sudo rules provide
|
||||||
@@ -241,4 +243,4 @@ restart (or start) Apache, but not run other commands via ``sudo``::
|
|||||||
|
|
||||||
|
|
||||||
This concludes the unit. Now that you have Sudo rules working,
|
This concludes the unit. Now that you have Sudo rules working,
|
||||||
proceed to `Unit 9: SELinux User Maps <9-selinux-user-map.rst>`_.
|
proceed to :ref:`Unit 9: SELinux User Maps <9-selinux-user-map>`.
|
||||||
@@ -1,11 +1,13 @@
|
|||||||
|
.. _9-selinux-user-map:
|
||||||
|
|
||||||
Unit 9: SELinux User Maps
|
Unit 9: SELinux User Maps
|
||||||
=========================
|
=========================
|
||||||
|
|
||||||
**Prerequisites**:
|
**Prerequisites**:
|
||||||
|
|
||||||
- `Unit 3: User management and Kerberos authentication <3-user-management.rst>`_
|
- :ref:`Unit 3: User management and Kerberos authentication <3-user-management>`
|
||||||
- `Unit 4: Host-based access control (HBAC) <4-hbac.rst>`_
|
- :ref:`Unit 4: Host-based access control (HBAC) <4-hbac>`
|
||||||
- `Unit 8: Sudo rule management <8-sudorule.rst>`_
|
- :ref:`Unit 8: Sudo rule management <8-sudorule>`
|
||||||
|
|
||||||
SELinux is a *mandatory access controls* mechanism for Linux,
|
SELinux is a *mandatory access controls* mechanism for Linux,
|
||||||
providing more powerful and flexible access control than traditional
|
providing more powerful and flexible access control than traditional
|
||||||
@@ -43,7 +45,7 @@ will automatically be used.
|
|||||||
|
|
||||||
Recall that members of the ``sysadmin`` User Group already have
|
Recall that members of the ``sysadmin`` User Group already have
|
||||||
access to ``webservers`` via the ``sysadmin_webservers`` rule that
|
access to ``webservers`` via the ``sysadmin_webservers`` rule that
|
||||||
was created in `Unit 4: Host-based access control (HBAC)`_. Create
|
was created in :ref:`Unit 4: Host-based access control (HBAC)<4-hbac>`. Create
|
||||||
the SELinux User Map::
|
the SELinux User Map::
|
||||||
|
|
||||||
[client]$ ipa selinuxusermap-add sysadmin_staff_t \
|
[client]$ ipa selinuxusermap-add sysadmin_staff_t \
|
||||||
@@ -135,7 +137,7 @@ the program being run::
|
|||||||
Hello, world!
|
Hello, world!
|
||||||
|
|
||||||
This concludes the unit. You can now proceed to
|
This concludes the unit. You can now proceed to
|
||||||
`Unit 10: SSH user and host key management <10-ssh-key-management.rst>`_
|
:ref:`Unit 10: SSH user and host key management <10-ssh-key-management>`
|
||||||
or
|
or
|
||||||
`return to the curriculum overview <workshop.rst#curriculum-overview>`_
|
:ref:`return to the curriculum overview <curriculum-overview>`
|
||||||
to see all the available topics.
|
to see all the available topics.
|
||||||
@@ -1,3 +1,5 @@
|
|||||||
|
.. _building:
|
||||||
|
|
||||||
Building Vagrant box images
|
Building Vagrant box images
|
||||||
===========================
|
===========================
|
||||||
|
|
||||||
|
|||||||
@@ -30,6 +30,6 @@ Example: https://goo.gl/forms/UOkcsVROqV
|
|||||||
Vagrant boxes
|
Vagrant boxes
|
||||||
-------------
|
-------------
|
||||||
|
|
||||||
See ``building.rst`` for instructions on building Vagrant boxes.
|
See :ref:`building` for instructions on building Vagrant boxes.
|
||||||
At time of writing, the ``freeipa/freeipa-workshop`` box is
|
At time of writing, the ``freeipa/freeipa-workshop`` box is
|
||||||
FreeIPA 4.9.3 / Fedora 34, for the VirtualBox and libvirt providers.
|
FreeIPA 4.9.3 / Fedora 34, for the VirtualBox and libvirt providers.
|
||||||
+16
-14
@@ -1,4 +1,5 @@
|
|||||||
..
|
.. _workshop:
|
||||||
|
|
||||||
Copyright 2015, 2016 Red Hat, Inc.
|
Copyright 2015, 2016 Red Hat, Inc.
|
||||||
|
|
||||||
This work is licensed under the Creative Commons Attribution 4.0
|
This work is licensed under the Creative Commons Attribution 4.0
|
||||||
@@ -18,27 +19,28 @@ X.509 certificates for services.
|
|||||||
|
|
||||||
.. _FreeIPA: http://www.freeipa.org/page/Main_Page
|
.. _FreeIPA: http://www.freeipa.org/page/Main_Page
|
||||||
|
|
||||||
|
.. _curriculum-overview:
|
||||||
|
|
||||||
Curriculum overview
|
Curriculum overview
|
||||||
-------------------
|
-------------------
|
||||||
|
|
||||||
Mandatory:
|
Mandatory:
|
||||||
|
|
||||||
- `Unit 1: Installing the FreeIPA server <1-server-install.rst>`_
|
- :ref:`Unit 1: Installing the FreeIPA server <1-server-install>`
|
||||||
- `Unit 2: Enrolling client machines <2-client-install.rst>`_
|
- :ref:`Unit 2: Enrolling client machines <2-client-install>`
|
||||||
- `Unit 3: User management and Kerberos authentication <3-user-management.rst>`_
|
- :ref:`Unit 3: User management and Kerberos authentication <3-user-management>`
|
||||||
- `Unit 4: Host-based access control (HBAC) <4-hbac.rst>`_
|
- :ref:`Unit 4: Host-based access control (HBAC) <4-hbac>`
|
||||||
|
|
||||||
Optional units—choose the topics that are relevant to you:
|
Optional units—choose the topics that are relevant to you:
|
||||||
|
|
||||||
- `Unit 5: Web application authentication and authorisation <5-web-app-authnz.rst>`_
|
- :ref:`Unit 5: Web application authentication and authorisation <5-web-app-authnz>`
|
||||||
- `Unit 6: Service certificates <6-cert-management.rst>`_
|
- :ref:`Unit 6: Service certificates <6-cert-management>`
|
||||||
- `Unit 7: Replica installation <7-replica-install.rst>`_
|
- :ref:`Unit 7: Replica installation <7-replica-install>`
|
||||||
- `Unit 8: Sudo rule management <8-sudorule.rst>`_
|
- :ref:`Unit 8: Sudo rule management <8-sudorule>`
|
||||||
- `Unit 9: SELinux User Maps <9-selinux-user-map.rst>`_
|
- :ref:`Unit 9: SELinux User Maps <9-selinux-user-map>`
|
||||||
- `Unit 10: SSH user and host key management <10-ssh-key-management.rst>`_
|
- :ref:`Unit 10: SSH user and host key management <10-ssh-key-management>`
|
||||||
- `Unit 11: Kerberos ticket policy <11-kerberos-ticket-policy.rst>`_
|
- :ref:`Unit 11: Kerberos ticket policy <11-kerberos-ticket-policy>`
|
||||||
- `Unit 12: External IdP support <12-external-idp-support.rst>`_
|
- :ref:`Unit 12: External IdP support <12-external-idp-support>`
|
||||||
|
|
||||||
Editing files on VMs
|
Editing files on VMs
|
||||||
--------------------
|
--------------------
|
||||||
@@ -241,7 +243,7 @@ Next step
|
|||||||
---------
|
---------
|
||||||
|
|
||||||
You are ready to begin the workshop. Continue to
|
You are ready to begin the workshop. Continue to
|
||||||
`Unit 1: Installing the FreeIPA server <1-server-install.rst>`_.
|
:ref:`Unit 1: Installing the FreeIPA server <1-server-install>`.
|
||||||
|
|
||||||
|
|
||||||
After the workshop
|
After the workshop
|
||||||
|
|||||||
+5
-4
@@ -1555,10 +1555,11 @@ fi
|
|||||||
%dir %{_sysconfdir}/ipa/html
|
%dir %{_sysconfdir}/ipa/html
|
||||||
%config(noreplace) %{_sysconfdir}/ipa/html/ssbrowser.html
|
%config(noreplace) %{_sysconfdir}/ipa/html/ssbrowser.html
|
||||||
%config(noreplace) %{_sysconfdir}/ipa/html/unauthorized.html
|
%config(noreplace) %{_sysconfdir}/ipa/html/unauthorized.html
|
||||||
%ghost %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipa-rewrite.conf
|
%dir %{_sysconfdir}/ipa/http
|
||||||
%ghost %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipa.conf
|
%ghost %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ipa/httpd/ipa-rewrite.conf
|
||||||
%ghost %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipa-kdc-proxy.conf
|
%ghost %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ipa/httpd/ipa.conf
|
||||||
%ghost %attr(0640,root,root) %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipa-pki-proxy.conf
|
%ghost %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ipa/httpd/ipa-kdc-proxy.conf
|
||||||
|
%ghost %attr(0640,root,root) %config(noreplace) %{_sysconfdir}/ipa/httpd/ipa-pki-proxy.conf
|
||||||
%ghost %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ipa/kdcproxy/ipa-kdc-proxy.conf
|
%ghost %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ipa/kdcproxy/ipa-kdc-proxy.conf
|
||||||
%ghost %attr(0644,root,root) %config(noreplace) %{_usr}/share/ipa/html/ca.crt
|
%ghost %attr(0644,root,root) %config(noreplace) %{_usr}/share/ipa/html/ca.crt
|
||||||
%ghost %attr(0640,root,named) %config(noreplace) %{_sysconfdir}/named/ipa-ext.conf
|
%ghost %attr(0640,root,named) %config(noreplace) %{_sysconfdir}/named/ipa-ext.conf
|
||||||
|
|||||||
@@ -101,6 +101,7 @@ dist_app_DATA = \
|
|||||||
ipa-kdc-proxy.conf.template \
|
ipa-kdc-proxy.conf.template \
|
||||||
ipa-pki-proxy.conf.template \
|
ipa-pki-proxy.conf.template \
|
||||||
ipa-rewrite.conf.template \
|
ipa-rewrite.conf.template \
|
||||||
|
ipa-vhost.conf.template \
|
||||||
ipaca_default.ini \
|
ipaca_default.ini \
|
||||||
ipaca_customize.ini \
|
ipaca_customize.ini \
|
||||||
ipaca_softhsm2.ini \
|
ipaca_softhsm2.ini \
|
||||||
|
|||||||
@@ -0,0 +1,50 @@
|
|||||||
|
#
|
||||||
|
# VERSION 32 - DO NOT REMOVE THIS LINE
|
||||||
|
#
|
||||||
|
# This file may be overwritten on upgrades.
|
||||||
|
#
|
||||||
|
|
||||||
|
# FIXME: WSGISocketPrefix is a server-scope directive. The mod_wsgi package
|
||||||
|
# should really be fixed by adding this its /etc/httpd/conf.d/wsgi.conf:
|
||||||
|
WSGISocketPrefix $WSGI_PREFIX_DIR
|
||||||
|
|
||||||
|
# Configure mod_wsgi handler for /ipa
|
||||||
|
WSGIDaemonProcess ipa processes=$WSGI_PROCESSES threads=1 maximum-requests=500 \
|
||||||
|
user=ipaapi group=ipaapi display-name=%{GROUP} socket-timeout=2147483647 \
|
||||||
|
lang=C.UTF-8 locale=C.UTF-8
|
||||||
|
|
||||||
|
<VirtualHost *:80>
|
||||||
|
ServerName $FQDN
|
||||||
|
ServerAlias ipa-ca.$DOMAIN
|
||||||
|
|
||||||
|
# Logging
|
||||||
|
CustomLog /var/log/httpd/ipa-access.log combined
|
||||||
|
ErrorLog /var/log/httpd/ipa-error.log
|
||||||
|
|
||||||
|
IncludeOptional $HTTPD_IPA_PKI_PROXY_CONF
|
||||||
|
Include $HTTPD_IPA_REWRITE_CONF
|
||||||
|
Include $HTTPD_IPA_CONF
|
||||||
|
</VirtualHost>
|
||||||
|
|
||||||
|
# the below section is only need if you have above 3 lines and want SSL
|
||||||
|
<VirtualHost *:443>
|
||||||
|
ServerName $FQDN
|
||||||
|
ServerAlias ipa-ca.$DOMAIN
|
||||||
|
|
||||||
|
# Logging
|
||||||
|
CustomLog /var/log/httpd/ipa-access.log combined
|
||||||
|
ErrorLog /var/log/httpd/ipa-error.log
|
||||||
|
|
||||||
|
# SSL
|
||||||
|
SSLEngine on
|
||||||
|
SSLCertificateFile $HTTPD_CERT_FILE
|
||||||
|
SSLCertificateKeyFile $HTTPD_KEY_FILE
|
||||||
|
SSLCACertificateFile $IPA_CA_CRT
|
||||||
|
SSLVerifyDepth $MOD_SSL_VERIFY_DEPTH
|
||||||
|
|
||||||
|
# FreeIPA
|
||||||
|
IncludeOptional $HTTPD_IPA_KDCPROXY_CONF_SYMLINK
|
||||||
|
IncludeOptional $HTTPD_IPA_PKI_PROXY_CONF
|
||||||
|
Include $HTTPD_IPA_REWRITE_CONF
|
||||||
|
Include $HTTPD_IPA_CONF
|
||||||
|
</VirtualHost>
|
||||||
@@ -35,19 +35,11 @@ AddOutputFilterByType DEFLATE text/html text/plain text/xml \
|
|||||||
application/javascript application/json text/css \
|
application/javascript application/json text/css \
|
||||||
application/x-font-ttf
|
application/x-font-ttf
|
||||||
|
|
||||||
# FIXME: WSGISocketPrefix is a server-scope directive. The mod_wsgi package
|
|
||||||
# should really be fixed by adding this its /etc/httpd/conf.d/wsgi.conf:
|
|
||||||
WSGISocketPrefix $WSGI_PREFIX_DIR
|
|
||||||
|
|
||||||
# Configure mod_wsgi handler for /ipa
|
# Configure mod_wsgi handler for /ipa
|
||||||
WSGIDaemonProcess ipa processes=$WSGI_PROCESSES threads=1 maximum-requests=500 \
|
|
||||||
user=ipaapi group=ipaapi display-name=%{GROUP} socket-timeout=2147483647 \
|
|
||||||
lang=C.UTF-8 locale=C.UTF-8
|
|
||||||
WSGIScriptAlias /ipa /usr/share/ipa/wsgi.py process-group=ipa \
|
WSGIScriptAlias /ipa /usr/share/ipa/wsgi.py process-group=ipa \
|
||||||
application-group=%{GLOBAL}
|
application-group=%{GLOBAL}
|
||||||
WSGIScriptReloading Off
|
WSGIScriptReloading Off
|
||||||
|
|
||||||
|
|
||||||
# Turn off mod_msgi handler for errors, config, crl:
|
# Turn off mod_msgi handler for errors, config, crl:
|
||||||
<Location "/ipa/errors">
|
<Location "/ipa/errors">
|
||||||
SetHandler None
|
SetHandler None
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
dn: $SUFFIX
|
||||||
|
add:aci: (targetattr = "memberPrincipal")(targattrfilters="add=objectclass:(objectclass=resourcedelegation)")(version 3.0;acl "permission:RBCD:Kerberos principals can manage resource-based constrained delegation for themselves";allow (write) userdn = "ldap:///self";)
|
||||||
|
add:aci: (targetattr = "memberPrincipal")(targattrfilters="add=objectclass:(objectclass=resourcedelegation)")(version 3.0;acl "permission:RBCD:Managing principals can manage resource-based constrained delegation for other principals";allow (write) userattr = "managedby#GROUPDN" or userattr = "managedby#USERDN";)
|
||||||
|
add:aci: (targetattr = "memberPrincipal")(targattrfilters="add=objectclass:(objectclass=resourcedelegation)")(version 3.0;acl "permission:RBCD:Delegated permission to manage resource-based constrained delegation for other principals";allow (write) userattr="ipaAllowedToPerform;write_delegation#GROUPDN" or userattr="ipaAllowedToPerform;write_delegation#USERDN" ;)
|
||||||
|
|
||||||
@@ -67,6 +67,7 @@ app_DATA = \
|
|||||||
73-winsync.update \
|
73-winsync.update \
|
||||||
73-certmap.update \
|
73-certmap.update \
|
||||||
73-passkey.update \
|
73-passkey.update \
|
||||||
|
73-service-rbcd.update \
|
||||||
75-user-trust-attributes.update \
|
75-user-trust-attributes.update \
|
||||||
80-schema_compat.update \
|
80-schema_compat.update \
|
||||||
81-externalmembers.update \
|
81-externalmembers.update \
|
||||||
|
|||||||
@@ -67,6 +67,7 @@ from ipapython.ipautil import (
|
|||||||
)
|
)
|
||||||
from ipapython.ssh import SSHPublicKey
|
from ipapython.ssh import SSHPublicKey
|
||||||
from ipapython import version
|
from ipapython import version
|
||||||
|
from ipapython.errors import SetseboolError
|
||||||
|
|
||||||
from . import automount, timeconf, sssd
|
from . import automount, timeconf, sssd
|
||||||
from ipaclient import discovery
|
from ipaclient import discovery
|
||||||
@@ -98,6 +99,7 @@ cli_realm = None
|
|||||||
cli_kdc = None
|
cli_kdc = None
|
||||||
client_domain = None
|
client_domain = None
|
||||||
cli_basedn = None
|
cli_basedn = None
|
||||||
|
selinux_works = None
|
||||||
# end of global variables
|
# end of global variables
|
||||||
|
|
||||||
|
|
||||||
@@ -2153,6 +2155,7 @@ def install_check(options):
|
|||||||
global cli_kdc
|
global cli_kdc
|
||||||
global client_domain
|
global client_domain
|
||||||
global cli_basedn
|
global cli_basedn
|
||||||
|
global selinux_works
|
||||||
|
|
||||||
print("This program will set up IPA client.")
|
print("This program will set up IPA client.")
|
||||||
print("Version {}".format(version.VERSION))
|
print("Version {}".format(version.VERSION))
|
||||||
@@ -2166,7 +2169,7 @@ def install_check(options):
|
|||||||
"You must be root to run ipa-client-install.",
|
"You must be root to run ipa-client-install.",
|
||||||
rval=CLIENT_INSTALL_ERROR)
|
rval=CLIENT_INSTALL_ERROR)
|
||||||
|
|
||||||
tasks.check_selinux_status()
|
selinux_works = tasks.check_selinux_status()
|
||||||
|
|
||||||
if is_ipa_client_configured(on_master=options.on_master):
|
if is_ipa_client_configured(on_master=options.on_master):
|
||||||
logger.error("IPA client is already configured on this system.")
|
logger.error("IPA client is already configured on this system.")
|
||||||
@@ -2674,6 +2677,20 @@ def restore_time_sync(statestore, fstore):
|
|||||||
logger.error('Failed to restore time synchronization service: %s', e)
|
logger.error('Failed to restore time synchronization service: %s', e)
|
||||||
|
|
||||||
|
|
||||||
|
def configure_selinux_for_client(statestore):
|
||||||
|
def backup_state(key, value):
|
||||||
|
statestore.backup_state('selinux', key, value)
|
||||||
|
|
||||||
|
try:
|
||||||
|
tasks.set_selinux_booleans(constants.SELINUX_BOOLEAN_SSSD,
|
||||||
|
backup_state)
|
||||||
|
except SetseboolError as e:
|
||||||
|
for c in constants.SELINUX_BOOLEAN_SSSD:
|
||||||
|
if c in e.failed:
|
||||||
|
logger.warning(
|
||||||
|
"SELinux does not support SSSD boolean %s, ignoring", c)
|
||||||
|
|
||||||
|
|
||||||
def install(options):
|
def install(options):
|
||||||
try:
|
try:
|
||||||
_install(options, dict())
|
_install(options, dict())
|
||||||
@@ -3198,6 +3215,9 @@ def _install(options, tdict):
|
|||||||
logger.info("%s enabled", "SSSD" if options.sssd else "LDAP")
|
logger.info("%s enabled", "SSSD" if options.sssd else "LDAP")
|
||||||
|
|
||||||
if options.sssd:
|
if options.sssd:
|
||||||
|
if selinux_works:
|
||||||
|
configure_selinux_for_client(statestore)
|
||||||
|
|
||||||
sssd = services.service('sssd', api)
|
sssd = services.service('sssd', api)
|
||||||
try:
|
try:
|
||||||
sssd.restart()
|
sssd.restart()
|
||||||
@@ -3322,6 +3342,8 @@ def _install(options, tdict):
|
|||||||
|
|
||||||
|
|
||||||
def uninstall_check(options):
|
def uninstall_check(options):
|
||||||
|
global selinux_works
|
||||||
|
|
||||||
if not is_ipa_client_configured():
|
if not is_ipa_client_configured():
|
||||||
if options.on_master:
|
if options.on_master:
|
||||||
rval = SUCCESS
|
rval = SUCCESS
|
||||||
@@ -3337,6 +3359,8 @@ def uninstall_check(options):
|
|||||||
logger.info("Refer to ipa-server-install for uninstallation.")
|
logger.info("Refer to ipa-server-install for uninstallation.")
|
||||||
raise ScriptError(rval=CLIENT_NOT_CONFIGURED)
|
raise ScriptError(rval=CLIENT_NOT_CONFIGURED)
|
||||||
|
|
||||||
|
selinux_works = tasks.check_selinux_status()
|
||||||
|
|
||||||
|
|
||||||
def uninstall(options):
|
def uninstall(options):
|
||||||
env = {'PATH': SECURE_PATH}
|
env = {'PATH': SECURE_PATH}
|
||||||
@@ -3600,6 +3624,15 @@ def uninstall(options):
|
|||||||
"Failed to disable automatic startup of the SSSD daemon: %s",
|
"Failed to disable automatic startup of the SSSD daemon: %s",
|
||||||
e)
|
e)
|
||||||
|
|
||||||
|
if statestore.has_state('selinux'):
|
||||||
|
# Restore SELinux boolean states
|
||||||
|
boolean_states = {name: statestore.restore_state('selinux', name)
|
||||||
|
for name in constants.SELINUX_BOOLEAN_SSSD}
|
||||||
|
try:
|
||||||
|
tasks.set_selinux_booleans(boolean_states)
|
||||||
|
except SetseboolError as e:
|
||||||
|
logger.warning("Unable to reset SELinux variable: %s", str(e))
|
||||||
|
|
||||||
tasks.restore_hostname(fstore, statestore)
|
tasks.restore_hostname(fstore, statestore)
|
||||||
|
|
||||||
if fstore.has_files():
|
if fstore.has_files():
|
||||||
|
|||||||
@@ -33,7 +33,8 @@ import ssl
|
|||||||
import time
|
import time
|
||||||
|
|
||||||
from collections import deque
|
from collections import deque
|
||||||
from datetime import datetime, timedelta, UTC
|
from datetime import datetime, timedelta, timezone
|
||||||
|
UTC = timezone.utc
|
||||||
from email.utils import formataddr, formatdate
|
from email.utils import formataddr, formatdate
|
||||||
from email.mime.multipart import MIMEMultipart
|
from email.mime.multipart import MIMEMultipart
|
||||||
from email.mime.text import MIMEText
|
from email.mime.text import MIMEText
|
||||||
|
|||||||
@@ -936,6 +936,68 @@ Registry = plugable.Registry
|
|||||||
class API(plugable.API):
|
class API(plugable.API):
|
||||||
bases = (Command, Object, Method, Backend, Updater)
|
bases = (Command, Object, Method, Backend, Updater)
|
||||||
|
|
||||||
|
def __enter__(self):
|
||||||
|
"""Context manager for IPA API
|
||||||
|
|
||||||
|
The context manager connects the backend connect on enter and
|
||||||
|
disconnects on exit. The process must have access to a valid Kerberos
|
||||||
|
ticket or have automatic authentication with a keytab or gssproxy
|
||||||
|
set up. The connection type depends on ``in_server`` and ``context``
|
||||||
|
options. Server connections use LDAP while clients use JSON-RPC over
|
||||||
|
HTTPS.
|
||||||
|
|
||||||
|
The context manager also finalizes the API object, in case it hasn't
|
||||||
|
been finalized yet. It is possible to use a custom API object. In
|
||||||
|
that case, the global API object must be finalized, first. Some
|
||||||
|
options like logging only apply to global ``ipalib.api`` object.
|
||||||
|
|
||||||
|
Usage with global api object::
|
||||||
|
|
||||||
|
import os
|
||||||
|
import ipalib
|
||||||
|
|
||||||
|
# optional: automatic authentication with a KRB5 keytab
|
||||||
|
os.environ.update(
|
||||||
|
KRB5_CLIENT_KTNAME="/path/to/service.keytab",
|
||||||
|
KRB5RCACHENAME="FILE:/path/to/tmp/service.ccache",
|
||||||
|
)
|
||||||
|
|
||||||
|
# optional: override settings (once per process)
|
||||||
|
overrides = {}
|
||||||
|
ipalib.api.bootstrap(**overrides)
|
||||||
|
|
||||||
|
with ipalib.api as api:
|
||||||
|
host = api.Command.host_show(api.env.host)
|
||||||
|
user = api.Command.user_show("admin")
|
||||||
|
|
||||||
|
"""
|
||||||
|
# Several IPA module require api.env at import time, some even
|
||||||
|
# a fully finalized ipalib.ap, e.g. register() with MethodOverride.
|
||||||
|
if self is not api and not api.isdone("finalize"):
|
||||||
|
raise RuntimeError("global ipalib.api must be finalized first.")
|
||||||
|
# initialize this api
|
||||||
|
if not self.isdone("finalize"):
|
||||||
|
self.finalize()
|
||||||
|
# connect backend, server and client use different backends.
|
||||||
|
if self.env.in_server:
|
||||||
|
conn = self.Backend.ldap2
|
||||||
|
else:
|
||||||
|
conn = self.Backend.rpcclient
|
||||||
|
if conn.isconnected():
|
||||||
|
raise RuntimeError("API is already connected")
|
||||||
|
else:
|
||||||
|
conn.connect()
|
||||||
|
return self
|
||||||
|
|
||||||
|
def __exit__(self, exc_type, exc_val, exc_tb):
|
||||||
|
"""Disconnect backend on exit"""
|
||||||
|
if self.env.in_server:
|
||||||
|
conn = self.Backend.ldap2
|
||||||
|
else:
|
||||||
|
conn = self.Backend.rpcclient
|
||||||
|
if conn.isconnected():
|
||||||
|
conn.disconnect()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def packages(self):
|
def packages(self):
|
||||||
if self.env.in_server:
|
if self.env.in_server:
|
||||||
|
|||||||
@@ -1836,7 +1836,7 @@ class DateTime(Param):
|
|||||||
def _convert_scalar(self, value, index=None):
|
def _convert_scalar(self, value, index=None):
|
||||||
if isinstance(value, str):
|
if isinstance(value, str):
|
||||||
if value == u'now':
|
if value == u'now':
|
||||||
time = datetime.datetime.now(tz=datetime.UTC)
|
time = datetime.datetime.now(tz=datetime.timezone.utc)
|
||||||
return time
|
return time
|
||||||
else:
|
else:
|
||||||
for date_format in self.accepted_formats:
|
for date_format in self.accepted_formats:
|
||||||
|
|||||||
+3
-2
@@ -819,7 +819,8 @@ class KerbTransport(SSLTransport):
|
|||||||
session_cookie = (
|
session_cookie = (
|
||||||
Cookie.get_named_cookie_from_string(
|
Cookie.get_named_cookie_from_string(
|
||||||
cookie, COOKIE_NAME, request_url,
|
cookie, COOKIE_NAME, request_url,
|
||||||
timestamp=datetime.datetime.now(tz=datetime.UTC))
|
timestamp=datetime.datetime.now(
|
||||||
|
tz=datetime.timezone.utc))
|
||||||
)
|
)
|
||||||
if session_cookie is not None:
|
if session_cookie is not None:
|
||||||
break
|
break
|
||||||
@@ -922,7 +923,7 @@ class RPCClient(Connectible):
|
|||||||
try:
|
try:
|
||||||
session_cookie = Cookie.get_named_cookie_from_string(
|
session_cookie = Cookie.get_named_cookie_from_string(
|
||||||
cookie_string, COOKIE_NAME,
|
cookie_string, COOKIE_NAME,
|
||||||
timestamp=datetime.datetime.now(tz=datetime.UTC))
|
timestamp=datetime.datetime.now(tz=datetime.timezone.utc))
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.debug(
|
logger.debug(
|
||||||
'Error retrieving cookie from the persistent storage: %s',
|
'Error retrieving cookie from the persistent storage: %s',
|
||||||
|
|||||||
+2
-2
@@ -267,12 +267,12 @@ class IPACertificate(crypto_x509.Certificate):
|
|||||||
@property
|
@property
|
||||||
def not_valid_before(self):
|
def not_valid_before(self):
|
||||||
return datetime.datetime.fromtimestamp(
|
return datetime.datetime.fromtimestamp(
|
||||||
self._cert.not_valid_before.timestamp(), tz=datetime.UTC)
|
self._cert.not_valid_before.timestamp(), tz=datetime.timezone.utc)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def not_valid_after(self):
|
def not_valid_after(self):
|
||||||
return datetime.datetime.fromtimestamp(
|
return datetime.datetime.fromtimestamp(
|
||||||
self._cert.not_valid_after.timestamp(), tz=datetime.UTC)
|
self._cert.not_valid_after.timestamp(), tz=datetime.timezone.utc)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def tbs_certificate_bytes(self):
|
def tbs_certificate_bytes(self):
|
||||||
|
|||||||
@@ -21,10 +21,11 @@ class IpaMetaImporter:
|
|||||||
def __init__(self, platform):
|
def __init__(self, platform):
|
||||||
self.platform = platform
|
self.platform = platform
|
||||||
|
|
||||||
def find_module(self, fullname, path=None):
|
def find_spec(self, fullname, path=None, target=None):
|
||||||
"""Meta importer hook"""
|
"""Meta importer hook"""
|
||||||
if fullname in self.modules:
|
if fullname in self.modules:
|
||||||
return self
|
module = self.load_module(fullname)
|
||||||
|
return module.__spec__
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def load_module(self, fullname):
|
def load_module(self, fullname):
|
||||||
|
|||||||
@@ -151,6 +151,9 @@ class BaseConstantsNamespace:
|
|||||||
'samba_share_nfs': 'on',
|
'samba_share_nfs': 'on',
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
SELINUX_BOOLEAN_SSSD = {
|
||||||
|
'sssd_use_usb': 'on',
|
||||||
|
}
|
||||||
SELINUX_MCS_MAX = 1023
|
SELINUX_MCS_MAX = 1023
|
||||||
SELINUX_MCS_REGEX = r"^c(\d+)([.,-]c(\d+))*$"
|
SELINUX_MCS_REGEX = r"^c(\d+)([.,-]c(\d+))*$"
|
||||||
SELINUX_MLS_MAX = 15
|
SELINUX_MLS_MAX = 15
|
||||||
|
|||||||
@@ -45,11 +45,13 @@ class BasePathNamespace:
|
|||||||
GSSAPI_SESSION_KEY = "/etc/httpd/alias/ipasession.key"
|
GSSAPI_SESSION_KEY = "/etc/httpd/alias/ipasession.key"
|
||||||
OLD_KRA_AGENT_PEM = "/etc/httpd/alias/kra-agent.pem"
|
OLD_KRA_AGENT_PEM = "/etc/httpd/alias/kra-agent.pem"
|
||||||
HTTPD_CONF_D_DIR = "/etc/httpd/conf.d/"
|
HTTPD_CONF_D_DIR = "/etc/httpd/conf.d/"
|
||||||
|
HTTPD_IPA_DIR = "/etc/ipa/httpd"
|
||||||
HTTPD_IPA_KDCPROXY_CONF = "/etc/ipa/kdcproxy/ipa-kdc-proxy.conf"
|
HTTPD_IPA_KDCPROXY_CONF = "/etc/ipa/kdcproxy/ipa-kdc-proxy.conf"
|
||||||
HTTPD_IPA_KDCPROXY_CONF_SYMLINK = "/etc/httpd/conf.d/ipa-kdc-proxy.conf"
|
HTTPD_IPA_KDCPROXY_CONF_SYMLINK = "/etc/ipa/httpd/ipa-kdc-proxy.conf"
|
||||||
HTTPD_IPA_PKI_PROXY_CONF = "/etc/httpd/conf.d/ipa-pki-proxy.conf"
|
HTTPD_IPA_PKI_PROXY_CONF = "/etc/ipa/httpd/ipa-pki-proxy.conf"
|
||||||
HTTPD_IPA_REWRITE_CONF = "/etc/httpd/conf.d/ipa-rewrite.conf"
|
HTTPD_IPA_REWRITE_CONF = "/etc/ipa/httpd/ipa-rewrite.conf"
|
||||||
HTTPD_IPA_CONF = "/etc/httpd/conf.d/ipa.conf"
|
HTTPD_IPA_CONF = "/etc/ipa/httpd/ipa.conf"
|
||||||
|
HTTPD_IPA_SITE_CONF = "/etc/httpd/conf.d/ipa-vhost.conf"
|
||||||
HTTPD_NSS_CONF = "/etc/httpd/conf.d/nss.conf"
|
HTTPD_NSS_CONF = "/etc/httpd/conf.d/nss.conf"
|
||||||
HTTPD_SSL_CONF = "/etc/httpd/conf.d/ssl.conf"
|
HTTPD_SSL_CONF = "/etc/httpd/conf.d/ssl.conf"
|
||||||
HTTPD_SSL_SITE_CONF = "/etc/httpd/conf.d/ssl.conf"
|
HTTPD_SSL_SITE_CONF = "/etc/httpd/conf.d/ssl.conf"
|
||||||
|
|||||||
@@ -20,10 +20,12 @@ class DebianPathNamespace(BasePathNamespace):
|
|||||||
ETC_HTTPD_DIR = "/etc/apache2"
|
ETC_HTTPD_DIR = "/etc/apache2"
|
||||||
HTTPD_ALIAS_DIR = "/etc/apache2/ipa"
|
HTTPD_ALIAS_DIR = "/etc/apache2/ipa"
|
||||||
HTTPD_CONF_D_DIR = "/etc/apache2/conf-enabled/"
|
HTTPD_CONF_D_DIR = "/etc/apache2/conf-enabled/"
|
||||||
HTTPD_IPA_KDCPROXY_CONF_SYMLINK = "/etc/apache2/conf-enabled/ipa-kdc-proxy.conf"
|
HTTPD_IPA_DIR = "/etc/ipa/httpd/"
|
||||||
HTTPD_IPA_PKI_PROXY_CONF = "/etc/apache2/conf-enabled/ipa-pki-proxy.conf"
|
HTTPD_IPA_KDCPROXY_CONF_SYMLINK = "/etc/ipa/httpd/ipa-kdc-proxy.conf"
|
||||||
HTTPD_IPA_REWRITE_CONF = "/etc/apache2/conf-available/ipa-rewrite.conf"
|
HTTPD_IPA_PKI_PROXY_CONF = "/etc/ipa/httpd/ipa-pki-proxy.conf"
|
||||||
HTTPD_IPA_CONF = "/etc/apache2/conf-enabled/ipa.conf"
|
HTTPD_IPA_REWRITE_CONF = "/etc/ipa/httpd/ipa-rewrite.conf"
|
||||||
|
HTTPD_IPA_CONF = "/etc/ipa/httpd/ipa.conf"
|
||||||
|
HTTPD_IPA_SITE_CONF = "/etc/apache2/sites-available/ipa.conf"
|
||||||
HTTPD_NSS_CONF = "/etc/apache2/mods-available/nss.conf"
|
HTTPD_NSS_CONF = "/etc/apache2/mods-available/nss.conf"
|
||||||
HTTPD_SSL_CONF = "/etc/apache2/mods-available/ssl.conf"
|
HTTPD_SSL_CONF = "/etc/apache2/mods-available/ssl.conf"
|
||||||
HTTPD_SSL_SITE_CONF = "/etc/apache2/sites-available/default-ssl.conf"
|
HTTPD_SSL_SITE_CONF = "/etc/apache2/sites-available/default-ssl.conf"
|
||||||
|
|||||||
@@ -17,10 +17,12 @@ class SusePathNamespace(BasePathNamespace):
|
|||||||
HTTPD_ALIAS_DIR = "/etc/apache2/ipa"
|
HTTPD_ALIAS_DIR = "/etc/apache2/ipa"
|
||||||
GSSAPI_SESSION_KEY = "/etc/apache2/ipa/ipasession.key"
|
GSSAPI_SESSION_KEY = "/etc/apache2/ipa/ipasession.key"
|
||||||
HTTPD_CONF_D_DIR = "/etc/apache2/conf.d/"
|
HTTPD_CONF_D_DIR = "/etc/apache2/conf.d/"
|
||||||
HTTPD_IPA_KDCPROXY_CONF_SYMLINK = "/etc/apache2/conf.d/ipa-kdc-proxy.conf"
|
HTTPD_IPA_DIR = "/etc/ipa/httpd/"
|
||||||
HTTPD_IPA_PKI_PROXY_CONF = "/etc/apache2/conf.d/ipa-pki-proxy.conf"
|
HTTPD_IPA_KDCPROXY_CONF_SYMLINK = "/etc/ipa/httpd/ipa-kdc-proxy.conf"
|
||||||
HTTPD_IPA_REWRITE_CONF = "/etc/apache2/conf.d/ipa-rewrite.conf"
|
HTTPD_IPA_PKI_PROXY_CONF = "/etc/ipa/httpd/ipa-pki-proxy.conf"
|
||||||
HTTPD_IPA_CONF = "/etc/apache2/conf.d/ipa.conf"
|
HTTPD_IPA_REWRITE_CONF = "/etc/ipa/httpd/ipa-rewrite.conf"
|
||||||
|
HTTPD_IPA_CONF = "/etc/ipa/httpd/ipa.conf"
|
||||||
|
HTTPD_IPA_SITE_CONF = "/etc/apache2/conf.d/ipa-vhost.conf"
|
||||||
HTTPD_NSS_CONF = "/etc/apache2/conf.d/nss.conf"
|
HTTPD_NSS_CONF = "/etc/apache2/conf.d/nss.conf"
|
||||||
HTTPD_SSL_CONF = "/etc/apache2/conf.d/ssl.conf"
|
HTTPD_SSL_CONF = "/etc/apache2/conf.d/ssl.conf"
|
||||||
HTTPD_SSL_SITE_CONF = "/etc/apache2/conf.d/ssl.conf"
|
HTTPD_SSL_SITE_CONF = "/etc/apache2/conf.d/ssl.conf"
|
||||||
|
|||||||
+1
-1
@@ -943,7 +943,7 @@ class NSSDatabase:
|
|||||||
def _verify_cert_validity(self, cert):
|
def _verify_cert_validity(self, cert):
|
||||||
"""Common checks for cert validity
|
"""Common checks for cert validity
|
||||||
"""
|
"""
|
||||||
utcnow = datetime.datetime.now(tz=datetime.UTC)
|
utcnow = datetime.datetime.now(tz=datetime.timezone.utc)
|
||||||
if cert.not_valid_before > utcnow:
|
if cert.not_valid_before > utcnow:
|
||||||
raise ValueError(
|
raise ValueError(
|
||||||
f"not valid before {cert.not_valid_before} UTC is in the "
|
f"not valid before {cert.not_valid_before} UTC is in the "
|
||||||
|
|||||||
+1
-1
@@ -652,7 +652,7 @@ class Cookie:
|
|||||||
|
|
||||||
cookie_expiration = self.get_expiration()
|
cookie_expiration = self.get_expiration()
|
||||||
if cookie_expiration is not None:
|
if cookie_expiration is not None:
|
||||||
now = datetime.datetime.now(tz=datetime.UTC)
|
now = datetime.datetime.now(tz=datetime.timezone.utc)
|
||||||
if cookie_expiration < now:
|
if cookie_expiration < now:
|
||||||
raise Cookie.Expired("cookie named '%s'; expired at %s'" % \
|
raise Cookie.Expired("cookie named '%s'; expired at %s'" % \
|
||||||
(cookie_name,
|
(cookie_name,
|
||||||
|
|||||||
@@ -740,7 +740,7 @@ class _CrossProcessLock:
|
|||||||
self._do(self._release, owner)
|
self._do(self._release, owner)
|
||||||
|
|
||||||
def _acquire(self, owner):
|
def _acquire(self, owner):
|
||||||
now = datetime.datetime.now(tz=datetime.UTC)
|
now = datetime.datetime.now(tz=datetime.timezone.utc)
|
||||||
|
|
||||||
if self._locked and now >= self._expire:
|
if self._locked and now >= self._expire:
|
||||||
self._locked = False
|
self._locked = False
|
||||||
@@ -800,7 +800,7 @@ class _CrossProcessLock:
|
|||||||
try:
|
try:
|
||||||
self._expire = datetime.datetime.strptime(
|
self._expire = datetime.datetime.strptime(
|
||||||
expire, self._DATETIME_FORMAT).replace(
|
expire, self._DATETIME_FORMAT).replace(
|
||||||
tzinfo=datetime.UTC)
|
tzinfo=datetime.timezone.utc)
|
||||||
except ValueError:
|
except ValueError:
|
||||||
raise configparser.Error
|
raise configparser.Error
|
||||||
except configparser.Error:
|
except configparser.Error:
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ from lib389.idm.ipadomain import IpaDomain
|
|||||||
from lib389.instance.options import General2Base, Slapd2Base
|
from lib389.instance.options import General2Base, Slapd2Base
|
||||||
from lib389.instance.remove import remove_ds_instance as lib389_remove_ds
|
from lib389.instance.remove import remove_ds_instance as lib389_remove_ds
|
||||||
from lib389.instance.setup import SetupDs
|
from lib389.instance.setup import SetupDs
|
||||||
|
from lib389.utils import get_default_db_lib
|
||||||
|
|
||||||
from ipalib import x509
|
from ipalib import x509
|
||||||
from ipalib.install import certmonger, certstore
|
from ipalib.install import certmonger, certstore
|
||||||
@@ -227,7 +228,8 @@ class DsInstance(service.Service):
|
|||||||
def __common_setup(self):
|
def __common_setup(self):
|
||||||
|
|
||||||
self.step("creating directory server instance", self.__create_instance)
|
self.step("creating directory server instance", self.__create_instance)
|
||||||
self.step("tune ldbm plugin", self.__tune_ldbm)
|
if get_default_db_lib() == 'bdb':
|
||||||
|
self.step("tune ldbm plugin", self.__tune_ldbm)
|
||||||
if self.config_ldif is not None:
|
if self.config_ldif is not None:
|
||||||
self.step("stopping directory server", self.__stop_instance)
|
self.step("stopping directory server", self.__stop_instance)
|
||||||
self.step(
|
self.step(
|
||||||
|
|||||||
@@ -111,6 +111,14 @@ class HTTPInstance(service.Service):
|
|||||||
IPA_CCACHES=paths.IPA_CCACHES,
|
IPA_CCACHES=paths.IPA_CCACHES,
|
||||||
WSGI_PREFIX_DIR=paths.WSGI_PREFIX_DIR,
|
WSGI_PREFIX_DIR=paths.WSGI_PREFIX_DIR,
|
||||||
WSGI_PROCESSES=constants.WSGI_PROCESSES,
|
WSGI_PROCESSES=constants.WSGI_PROCESSES,
|
||||||
|
HTTPD_IPA_KDCPROXY_CONF_SYMLINK=paths.HTTPD_IPA_KDCPROXY_CONF_SYMLINK,
|
||||||
|
HTTPD_IPA_PKI_PROXY_CONF=paths.HTTPD_IPA_PKI_PROXY_CONF,
|
||||||
|
HTTPD_IPA_REWRITE_CONF=paths.HTTPD_IPA_REWRITE_CONF,
|
||||||
|
HTTPD_IPA_CONF=paths.HTTPD_IPA_CONF,
|
||||||
|
HTTPD_CERT_FILE=paths.HTTPD_CERT_FILE,
|
||||||
|
HTTPD_KEY_FILE=paths.HTTPD_KEY_FILE,
|
||||||
|
IPA_CA_CRT=paths.IPA_CA_CRT,
|
||||||
|
MOD_SSL_VERIFY_DEPTH=MOD_SSL_VERIFY_DEPTH,
|
||||||
)
|
)
|
||||||
self.ca_file = ca_file
|
self.ca_file = ca_file
|
||||||
if ca_is_configured is not None:
|
if ca_is_configured is not None:
|
||||||
@@ -128,7 +136,6 @@ class HTTPInstance(service.Service):
|
|||||||
self.step("configuring mod_ssl log directory",
|
self.step("configuring mod_ssl log directory",
|
||||||
self.set_mod_ssl_logdir)
|
self.set_mod_ssl_logdir)
|
||||||
self.step("disabling mod_ssl OCSP", self.disable_mod_ssl_ocsp)
|
self.step("disabling mod_ssl OCSP", self.disable_mod_ssl_ocsp)
|
||||||
self.step("adding URL rewriting rules", self.__add_include)
|
|
||||||
self.step("configuring httpd", self.__configure_http)
|
self.step("configuring httpd", self.__configure_http)
|
||||||
self.step("setting up httpd keytab", self.request_service_keytab)
|
self.step("setting up httpd keytab", self.request_service_keytab)
|
||||||
self.step("configuring Gssproxy", self.configure_gssproxy)
|
self.step("configuring Gssproxy", self.configure_gssproxy)
|
||||||
@@ -197,6 +204,14 @@ class HTTPInstance(service.Service):
|
|||||||
# https://pagure.io/freeipa/issue/7662
|
# https://pagure.io/freeipa/issue/7662
|
||||||
tasks.restore_context(session_dir)
|
tasks.restore_context(session_dir)
|
||||||
|
|
||||||
|
# create /etc/httpd/ipa
|
||||||
|
if not os.path.isdir(paths.HTTPD_IPA_DIR):
|
||||||
|
os.makedirs(paths.HTTPD_IPA_DIR)
|
||||||
|
# Must be world-readable / executable
|
||||||
|
os.chmod(paths.HTTPD_IPA_DIR, 0o755)
|
||||||
|
# Restore SELinux context of /etc/httpd/ipa
|
||||||
|
tasks.restore_context(paths.HTTPD_IPA_DIR)
|
||||||
|
|
||||||
target_fname = paths.HTTPD_IPA_CONF
|
target_fname = paths.HTTPD_IPA_CONF
|
||||||
http_txt = ipautil.template_file(
|
http_txt = ipautil.template_file(
|
||||||
os.path.join(paths.USR_SHARE_IPA_DIR,
|
os.path.join(paths.USR_SHARE_IPA_DIR,
|
||||||
@@ -208,6 +223,17 @@ class HTTPInstance(service.Service):
|
|||||||
http_fd.close()
|
http_fd.close()
|
||||||
os.chmod(target_fname, 0o644)
|
os.chmod(target_fname, 0o644)
|
||||||
|
|
||||||
|
target_fname = paths.HTTPD_IPA_SITE_CONF
|
||||||
|
http_txt = ipautil.template_file(
|
||||||
|
os.path.join(paths.USR_SHARE_IPA_DIR,
|
||||||
|
"ipa-vhost.conf.template"),
|
||||||
|
self.sub_dict)
|
||||||
|
self.fstore.backup_file(paths.HTTPD_IPA_SITE_CONF)
|
||||||
|
http_fd = open(target_fname, "w")
|
||||||
|
http_fd.write(http_txt)
|
||||||
|
http_fd.close()
|
||||||
|
os.chmod(target_fname, 0o644)
|
||||||
|
|
||||||
target_fname = paths.HTTPD_IPA_REWRITE_CONF
|
target_fname = paths.HTTPD_IPA_REWRITE_CONF
|
||||||
http_txt = ipautil.template_file(
|
http_txt = ipautil.template_file(
|
||||||
os.path.join(paths.USR_SHARE_IPA_DIR,
|
os.path.join(paths.USR_SHARE_IPA_DIR,
|
||||||
@@ -285,17 +311,6 @@ class HTTPInstance(service.Service):
|
|||||||
aug.set(ocsp_comment, '{} {}'.format(OCSP_DIRECTIVE, ocsp_state))
|
aug.set(ocsp_comment, '{} {}'.format(OCSP_DIRECTIVE, ocsp_state))
|
||||||
aug.save()
|
aug.save()
|
||||||
|
|
||||||
def __add_include(self):
|
|
||||||
"""This should run after __set_mod_nss_port so is already backed up"""
|
|
||||||
if installutils.update_file(paths.HTTPD_SSL_SITE_CONF,
|
|
||||||
'</VirtualHost>',
|
|
||||||
'Include {path}\n'
|
|
||||||
'</VirtualHost>'.format(
|
|
||||||
path=paths.HTTPD_IPA_REWRITE_CONF)
|
|
||||||
) != 0:
|
|
||||||
self.print_msg("Adding Include conf.d/ipa-rewrite to "
|
|
||||||
"%s failed." % paths.HTTPD_SSL_SITE_CONF)
|
|
||||||
|
|
||||||
def configure_certmonger_renewal_guard(self):
|
def configure_certmonger_renewal_guard(self):
|
||||||
certmonger = services.knownservices.certmonger
|
certmonger = services.knownservices.certmonger
|
||||||
certmonger_stopped = not certmonger.is_running()
|
certmonger_stopped = not certmonger.is_running()
|
||||||
@@ -553,13 +568,14 @@ class HTTPInstance(service.Service):
|
|||||||
paths.HTTPD_PASSWD_FILE_FMT.format(host=api.env.host),
|
paths.HTTPD_PASSWD_FILE_FMT.format(host=api.env.host),
|
||||||
paths.HTTPD_IPA_REWRITE_CONF,
|
paths.HTTPD_IPA_REWRITE_CONF,
|
||||||
paths.HTTPD_IPA_CONF,
|
paths.HTTPD_IPA_CONF,
|
||||||
|
paths.HTTPD_IPA_SITE_CONF,
|
||||||
paths.HTTPD_IPA_PKI_PROXY_CONF,
|
paths.HTTPD_IPA_PKI_PROXY_CONF,
|
||||||
paths.HTTPD_IPA_KDCPROXY_CONF_SYMLINK,
|
paths.HTTPD_IPA_KDCPROXY_CONF_SYMLINK,
|
||||||
paths.HTTPD_IPA_KDCPROXY_CONF,
|
paths.HTTPD_IPA_KDCPROXY_CONF,
|
||||||
paths.GSSPROXY_CONF,
|
paths.GSSPROXY_CONF,
|
||||||
paths.GSSAPI_SESSION_KEY,
|
paths.GSSAPI_SESSION_KEY,
|
||||||
paths.HTTPD_PASSWORD_CONF,
|
paths.HTTPD_PASSWORD_CONF,
|
||||||
paths.SYSTEMD_SYSTEM_HTTPD_IPA_CONF,
|
paths.SYSTEMD_SYSTEM_HTTPD_IPA_CONF
|
||||||
]
|
]
|
||||||
# NSS DB backups
|
# NSS DB backups
|
||||||
remove_files.extend(
|
remove_files.extend(
|
||||||
@@ -671,7 +687,6 @@ class HTTPInstance(service.Service):
|
|||||||
self.configure_mod_ssl_certs()
|
self.configure_mod_ssl_certs()
|
||||||
self.set_mod_ssl_protocol()
|
self.set_mod_ssl_protocol()
|
||||||
self.set_mod_ssl_logdir()
|
self.set_mod_ssl_logdir()
|
||||||
self.__add_include()
|
|
||||||
|
|
||||||
self.cert = x509.load_certificate_from_file(paths.HTTPD_CERT_FILE)
|
self.cert = x509.load_certificate_from_file(paths.HTTPD_CERT_FILE)
|
||||||
|
|
||||||
|
|||||||
@@ -154,6 +154,7 @@ class Backup(admintool.AdminTool):
|
|||||||
paths.HTTPD_CERT_FILE,
|
paths.HTTPD_CERT_FILE,
|
||||||
paths.HTTPD_KEY_FILE,
|
paths.HTTPD_KEY_FILE,
|
||||||
paths.HTTPD_IPA_CONF,
|
paths.HTTPD_IPA_CONF,
|
||||||
|
paths.HTTPD_IPA_SITE_CONF,
|
||||||
paths.SSHD_CONFIG,
|
paths.SSHD_CONFIG,
|
||||||
paths.SSHD_IPA_CONFIG,
|
paths.SSHD_IPA_CONFIG,
|
||||||
paths.SSH_CONFIG,
|
paths.SSH_CONFIG,
|
||||||
|
|||||||
@@ -556,7 +556,7 @@ class CACertManage(admintool.AdminTool):
|
|||||||
api.env.realm,
|
api.env.realm,
|
||||||
False)
|
False)
|
||||||
|
|
||||||
now = datetime.datetime.now(tz=datetime.UTC)
|
now = datetime.datetime.now(tz=datetime.timezone.utc)
|
||||||
for ca_cert, ca_nickname, _ca_trust_flags in ca_certs:
|
for ca_cert, ca_nickname, _ca_trust_flags in ca_certs:
|
||||||
if ca_cert.not_valid_after < now:
|
if ca_cert.not_valid_after < now:
|
||||||
expired_certs.append(ca_nickname)
|
expired_certs.append(ca_nickname)
|
||||||
|
|||||||
@@ -129,7 +129,7 @@ class IPACertFix(AdminTool):
|
|||||||
ca_subject_dn = ca.lookup_ca_subject(api, subject_base)
|
ca_subject_dn = ca.lookup_ca_subject(api, subject_base)
|
||||||
|
|
||||||
now = (
|
now = (
|
||||||
datetime.datetime.now(tz=datetime.UTC)
|
datetime.datetime.now(tz=datetime.timezone.utc)
|
||||||
+ datetime.timedelta(weeks=2))
|
+ datetime.timedelta(weeks=2))
|
||||||
certs, extra_certs, non_renewed = expired_certs(now)
|
certs, extra_certs, non_renewed = expired_certs(now)
|
||||||
|
|
||||||
|
|||||||
@@ -781,6 +781,20 @@ def promotion_check_host_principal_auth_ind(conn, hostdn):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def remote_connection(config):
|
||||||
|
ldapuri = 'ldaps://%s' % ipautil.format_netloc(config.master_host_name)
|
||||||
|
xmlrpc_uri = 'https://{}/ipa/xml'.format(
|
||||||
|
ipautil.format_netloc(config.master_host_name))
|
||||||
|
remote_api = create_api(mode=None)
|
||||||
|
remote_api.bootstrap(in_server=True,
|
||||||
|
context='installer',
|
||||||
|
confdir=paths.ETC_IPA,
|
||||||
|
ldap_uri=ldapuri,
|
||||||
|
xmlrpc_uri=xmlrpc_uri)
|
||||||
|
remote_api.finalize()
|
||||||
|
return remote_api
|
||||||
|
|
||||||
|
|
||||||
@common_cleanup
|
@common_cleanup
|
||||||
@preserve_enrollment_state
|
@preserve_enrollment_state
|
||||||
def promote_check(installer):
|
def promote_check(installer):
|
||||||
@@ -943,16 +957,7 @@ def promote_check(installer):
|
|||||||
raise RuntimeError("CA cert file is not available! Please reinstall"
|
raise RuntimeError("CA cert file is not available! Please reinstall"
|
||||||
"the client and try again.")
|
"the client and try again.")
|
||||||
|
|
||||||
ldapuri = 'ldaps://%s' % ipautil.format_netloc(config.master_host_name)
|
remote_api = remote_connection(config)
|
||||||
xmlrpc_uri = 'https://{}/ipa/xml'.format(
|
|
||||||
ipautil.format_netloc(config.master_host_name))
|
|
||||||
remote_api = create_api(mode=None)
|
|
||||||
remote_api.bootstrap(in_server=True,
|
|
||||||
context='installer',
|
|
||||||
confdir=paths.ETC_IPA,
|
|
||||||
ldap_uri=ldapuri,
|
|
||||||
xmlrpc_uri=xmlrpc_uri)
|
|
||||||
remote_api.finalize()
|
|
||||||
installer._remote_api = remote_api
|
installer._remote_api = remote_api
|
||||||
|
|
||||||
with rpc_client(remote_api) as client:
|
with rpc_client(remote_api) as client:
|
||||||
@@ -997,7 +1002,7 @@ def promote_check(installer):
|
|||||||
raise errors.ACIError(info="Not authorized")
|
raise errors.ACIError(info="Not authorized")
|
||||||
|
|
||||||
if installer._ccache is None:
|
if installer._ccache is None:
|
||||||
del os.environ['KRB5CCNAME']
|
os.environ.pop('KRB5CCNAME', None)
|
||||||
else:
|
else:
|
||||||
os.environ['KRB5CCNAME'] = installer._ccache
|
os.environ['KRB5CCNAME'] = installer._ccache
|
||||||
|
|
||||||
@@ -1082,7 +1087,16 @@ def promote_check(installer):
|
|||||||
'CA', conn, preferred_cas
|
'CA', conn, preferred_cas
|
||||||
)
|
)
|
||||||
if ca_host is not None:
|
if ca_host is not None:
|
||||||
|
if config.master_host_name != ca_host:
|
||||||
|
conn.disconnect()
|
||||||
|
del remote_api
|
||||||
|
config.master_host_name = ca_host
|
||||||
|
remote_api = remote_connection(config)
|
||||||
|
installer._remote_api = remote_api
|
||||||
|
conn = remote_api.Backend.ldap2
|
||||||
|
conn.connect(ccache=installer._ccache)
|
||||||
config.ca_host_name = ca_host
|
config.ca_host_name = ca_host
|
||||||
|
config.master_host_name = ca_host
|
||||||
ca_enabled = True
|
ca_enabled = True
|
||||||
if options.dirsrv_cert_files:
|
if options.dirsrv_cert_files:
|
||||||
logger.error("Certificates could not be provided when "
|
logger.error("Certificates could not be provided when "
|
||||||
@@ -1121,7 +1135,17 @@ def promote_check(installer):
|
|||||||
'KRA', conn, preferred_kras
|
'KRA', conn, preferred_kras
|
||||||
)
|
)
|
||||||
if kra_host is not None:
|
if kra_host is not None:
|
||||||
|
if config.master_host_name != kra_host:
|
||||||
|
conn.disconnect()
|
||||||
|
del remote_api
|
||||||
|
config.master_host_name = kra_host
|
||||||
|
remote_api = remote_connection(config)
|
||||||
|
installer._remote_api = remote_api
|
||||||
|
conn = remote_api.Backend.ldap2
|
||||||
|
conn.connect(ccache=installer._ccache)
|
||||||
config.kra_host_name = kra_host
|
config.kra_host_name = kra_host
|
||||||
|
config.ca_host_name = kra_host
|
||||||
|
config.master_host_name = kra_host
|
||||||
kra_enabled = True
|
kra_enabled = True
|
||||||
if options.setup_kra and options.server and \
|
if options.setup_kra and options.server and \
|
||||||
kra_host != options.server:
|
kra_host != options.server:
|
||||||
@@ -1187,7 +1211,7 @@ def promote_check(installer):
|
|||||||
if add_to_ipaservers:
|
if add_to_ipaservers:
|
||||||
# use user's credentials when the server host is not ipaservers
|
# use user's credentials when the server host is not ipaservers
|
||||||
if installer._ccache is None:
|
if installer._ccache is None:
|
||||||
del os.environ['KRB5CCNAME']
|
os.environ.pop('KRB5CCNAME', None)
|
||||||
else:
|
else:
|
||||||
os.environ['KRB5CCNAME'] = installer._ccache
|
os.environ['KRB5CCNAME'] = installer._ccache
|
||||||
|
|
||||||
@@ -1239,6 +1263,24 @@ def install(installer):
|
|||||||
if tasks.configure_pkcs11_modules(fstore):
|
if tasks.configure_pkcs11_modules(fstore):
|
||||||
print("Disabled p11-kit-proxy")
|
print("Disabled p11-kit-proxy")
|
||||||
|
|
||||||
|
_hostname, _sep, host_domain = config.host_name.partition('.')
|
||||||
|
fstore.backup_file(paths.KRB5_CONF)
|
||||||
|
|
||||||
|
# Write a new krb5.conf in case any values changed finding the
|
||||||
|
# right server to configure against (for CA, KRA).
|
||||||
|
logger.debug("Installing against server %s", config.master_host_name)
|
||||||
|
configure_krb5_conf(
|
||||||
|
cli_realm=api.env.realm,
|
||||||
|
cli_domain=api.env.domain,
|
||||||
|
cli_server=[config.master_host_name],
|
||||||
|
cli_kdc=[config.master_host_name],
|
||||||
|
dnsok=False,
|
||||||
|
filename=paths.KRB5_CONF,
|
||||||
|
client_domain=host_domain,
|
||||||
|
client_hostname=config.host_name,
|
||||||
|
configure_sssd=False
|
||||||
|
)
|
||||||
|
|
||||||
if installer._add_to_ipaservers:
|
if installer._add_to_ipaservers:
|
||||||
try:
|
try:
|
||||||
conn.connect(ccache=installer._ccache)
|
conn.connect(ccache=installer._ccache)
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ from augeas import Augeas
|
|||||||
from pkg_resources import parse_version
|
from pkg_resources import parse_version
|
||||||
|
|
||||||
from ipalib import api, x509
|
from ipalib import api, x509
|
||||||
from ipalib.constants import RENEWAL_CA_NAME, RA_AGENT_PROFILE, IPA_CA_RECORD
|
from ipalib.constants import RENEWAL_CA_NAME, RA_AGENT_PROFILE, IPA_CA_RECORD, MOD_SSL_VERIFY_DEPTH
|
||||||
from ipalib.install import certmonger
|
from ipalib.install import certmonger
|
||||||
from ipalib import sysrestore
|
from ipalib import sysrestore
|
||||||
from ipalib.facts import is_ipa_configured
|
from ipalib.facts import is_ipa_configured
|
||||||
@@ -1698,6 +1698,14 @@ def upgrade_configuration():
|
|||||||
IPA_CUSTODIA_SOCKET=paths.IPA_CUSTODIA_SOCKET,
|
IPA_CUSTODIA_SOCKET=paths.IPA_CUSTODIA_SOCKET,
|
||||||
KDCPROXY_CONFIG=paths.KDCPROXY_CONFIG,
|
KDCPROXY_CONFIG=paths.KDCPROXY_CONFIG,
|
||||||
DOMAIN=api.env.domain,
|
DOMAIN=api.env.domain,
|
||||||
|
HTTPD_IPA_KDCPROXY_CONF_SYMLINK=paths.HTTPD_IPA_KDCPROXY_CONF_SYMLINK,
|
||||||
|
HTTPD_IPA_PKI_PROXY_CONF=paths.HTTPD_IPA_PKI_PROXY_CONF,
|
||||||
|
HTTPD_IPA_REWRITE_CONF=paths.HTTPD_IPA_REWRITE_CONF,
|
||||||
|
HTTPD_IPA_CONF=paths.HTTPD_IPA_CONF,
|
||||||
|
HTTPD_CERT_FILE=paths.HTTPD_CERT_FILE,
|
||||||
|
HTTPD_KEY_FILE=paths.HTTPD_KEY_FILE,
|
||||||
|
IPA_CA_CRT=paths.IPA_CA_CRT,
|
||||||
|
MOD_SSL_VERIFY_DEPTH=MOD_SSL_VERIFY_DEPTH,
|
||||||
)
|
)
|
||||||
|
|
||||||
subject_base = find_subject_base()
|
subject_base = find_subject_base()
|
||||||
@@ -1734,6 +1742,9 @@ def upgrade_configuration():
|
|||||||
upgrade_file(sub_dict, paths.HTTPD_IPA_CONF,
|
upgrade_file(sub_dict, paths.HTTPD_IPA_CONF,
|
||||||
os.path.join(paths.USR_SHARE_IPA_DIR,
|
os.path.join(paths.USR_SHARE_IPA_DIR,
|
||||||
"ipa.conf.template"))
|
"ipa.conf.template"))
|
||||||
|
upgrade_file(sub_dict, paths.HTTPD_IPA_SITE_CONF,
|
||||||
|
os.path.join(paths.USR_SHARE_IPA_DIR,
|
||||||
|
"ipa-vhost.conf.template"))
|
||||||
upgrade_file(sub_dict, paths.HTTPD_IPA_REWRITE_CONF,
|
upgrade_file(sub_dict, paths.HTTPD_IPA_REWRITE_CONF,
|
||||||
os.path.join(paths.USR_SHARE_IPA_DIR,
|
os.path.join(paths.USR_SHARE_IPA_DIR,
|
||||||
"ipa-rewrite.conf.template"))
|
"ipa-rewrite.conf.template"))
|
||||||
|
|||||||
@@ -127,6 +127,8 @@ def find_providing_servers(svcname, conn=None, preferred_hosts=(), api=api):
|
|||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
servers.insert(0, host_name)
|
servers.insert(0, host_name)
|
||||||
|
logger.debug("Discovery: available servers for service '%s' are %s",
|
||||||
|
svcname, ', '.join(servers))
|
||||||
return servers
|
return servers
|
||||||
|
|
||||||
|
|
||||||
@@ -143,8 +145,11 @@ def find_providing_server(svcname, conn=None, preferred_hosts=(), api=api):
|
|||||||
svcname, conn=conn, preferred_hosts=preferred_hosts, api=api
|
svcname, conn=conn, preferred_hosts=preferred_hosts, api=api
|
||||||
)
|
)
|
||||||
if not servers:
|
if not servers:
|
||||||
|
logger.debug("Discovery: no '%s' service found.", svcname)
|
||||||
return None
|
return None
|
||||||
else:
|
else:
|
||||||
|
logger.debug("Discovery: using %s for '%s' service",
|
||||||
|
servers[0], svcname)
|
||||||
return servers[0]
|
return servers[0]
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -612,7 +612,10 @@ class baseuser_add(LDAPCreate):
|
|||||||
if entry_attrs.get('ipauserauthtype', None):
|
if entry_attrs.get('ipauserauthtype', None):
|
||||||
add_missing_object_class(ldap, u'ipauserauthtypeclass', dn,
|
add_missing_object_class(ldap, u'ipauserauthtypeclass', dn,
|
||||||
entry_attrs, update=False)
|
entry_attrs, update=False)
|
||||||
if entry_attrs.get('ipaidpconfiglink', None):
|
if (
|
||||||
|
entry_attrs.get('ipaidpconfiglink', None)
|
||||||
|
or entry_attrs.get('ipaidpsub', None)
|
||||||
|
):
|
||||||
add_missing_object_class(ldap, 'ipaidpuser', dn,
|
add_missing_object_class(ldap, 'ipaidpuser', dn,
|
||||||
entry_attrs, update=False)
|
entry_attrs, update=False)
|
||||||
|
|
||||||
@@ -720,7 +723,7 @@ class baseuser_mod(LDAPUpdate):
|
|||||||
# Some attributes may require additional object classes
|
# Some attributes may require additional object classes
|
||||||
special_attrs = {'ipasshpubkey', 'ipauserauthtype', 'userclass',
|
special_attrs = {'ipasshpubkey', 'ipauserauthtype', 'userclass',
|
||||||
'ipatokenradiusconfiglink', 'ipatokenradiususername',
|
'ipatokenradiusconfiglink', 'ipatokenradiususername',
|
||||||
'ipaidpconfiglink'}
|
'ipaidpconfiglink', 'ipaidpsub'}
|
||||||
if special_attrs.intersection(entry_attrs):
|
if special_attrs.intersection(entry_attrs):
|
||||||
if 'objectclass' in entry_attrs:
|
if 'objectclass' in entry_attrs:
|
||||||
obj_classes = entry_attrs['objectclass']
|
obj_classes = entry_attrs['objectclass']
|
||||||
@@ -749,6 +752,10 @@ class baseuser_mod(LDAPUpdate):
|
|||||||
answer = self.api.Object['radiusproxy'].get_dn_if_exists(cl)
|
answer = self.api.Object['radiusproxy'].get_dn_if_exists(cl)
|
||||||
entry_attrs['ipatokenradiusconfiglink'] = answer
|
entry_attrs['ipatokenradiusconfiglink'] = answer
|
||||||
|
|
||||||
|
if 'ipaidpsub' in entry_attrs:
|
||||||
|
if 'ipaidpuser' not in obj_classes:
|
||||||
|
entry_attrs['objectclass'].append('ipaidpuser')
|
||||||
|
|
||||||
if 'ipaidpconfiglink' in entry_attrs:
|
if 'ipaidpconfiglink' in entry_attrs:
|
||||||
cl = entry_attrs['ipaidpconfiglink']
|
cl = entry_attrs['ipaidpconfiglink']
|
||||||
if cl:
|
if cl:
|
||||||
|
|||||||
+300
-754
File diff suppressed because it is too large.
Load diff
@@ -35,7 +35,7 @@ class ExternalCA:
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, days=365, key_size=None):
|
def __init__(self, days=365, key_size=None):
|
||||||
self.now = datetime.datetime.now(tz=datetime.UTC)
|
self.now = datetime.datetime.now(tz=datetime.timezone.utc)
|
||||||
self.delta = datetime.timedelta(days=days)
|
self.delta = datetime.timedelta(days=days)
|
||||||
self.ca_key = None
|
self.ca_key = None
|
||||||
self.ca_public_key = None
|
self.ca_public_key = None
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ def setup_scim_server(host, version="main"):
|
|||||||
host.run_command(["pip", "install", "-r", f"{django_reqs}"])
|
host.run_command(["pip", "install", "-r", f"{django_reqs}"])
|
||||||
|
|
||||||
# Prepare models and database
|
# Prepare models and database
|
||||||
host.run_command(["python", "manage.py", "makemigrations", "ipatuura"],
|
host.run_command(["python", "manage.py", "makemigrations", "scim"],
|
||||||
cwd=f"{dir}/src/ipa-tuura")
|
cwd=f"{dir}/src/ipa-tuura")
|
||||||
host.run_command(["python", "manage.py", "migrate"],
|
host.run_command(["python", "manage.py", "migrate"],
|
||||||
cwd=f"{dir}/src/ipa-tuura")
|
cwd=f"{dir}/src/ipa-tuura")
|
||||||
|
|||||||
@@ -102,7 +102,7 @@ class KRB5PrincipalName(univ.Sequence):
|
|||||||
|
|
||||||
|
|
||||||
def profile_ca(builder, ca_nick, ca):
|
def profile_ca(builder, ca_nick, ca):
|
||||||
now = datetime.datetime.now(tz=datetime.UTC)
|
now = datetime.datetime.now(tz=datetime.timezone.utc)
|
||||||
|
|
||||||
builder = builder.not_valid_before(now)
|
builder = builder.not_valid_before(now)
|
||||||
builder = builder.not_valid_after(now + 10 * YEAR)
|
builder = builder.not_valid_after(now + 10 * YEAR)
|
||||||
@@ -174,7 +174,7 @@ def profile_ca(builder, ca_nick, ca):
|
|||||||
def profile_server(builder, ca_nick, ca,
|
def profile_server(builder, ca_nick, ca,
|
||||||
warp=datetime.timedelta(days=0), dns_name=None,
|
warp=datetime.timedelta(days=0), dns_name=None,
|
||||||
badusage=False, wildcard=False):
|
badusage=False, wildcard=False):
|
||||||
now = datetime.datetime.now(tz=datetime.UTC) + warp
|
now = datetime.datetime.now(tz=datetime.timezone.utc) + warp
|
||||||
|
|
||||||
builder = builder.not_valid_before(now)
|
builder = builder.not_valid_before(now)
|
||||||
builder = builder.not_valid_after(now + YEAR)
|
builder = builder.not_valid_after(now + YEAR)
|
||||||
@@ -231,7 +231,7 @@ def profile_server(builder, ca_nick, ca,
|
|||||||
def profile_kdc(builder, ca_nick, ca,
|
def profile_kdc(builder, ca_nick, ca,
|
||||||
warp=datetime.timedelta(days=0), dns_name=None,
|
warp=datetime.timedelta(days=0), dns_name=None,
|
||||||
badusage=False):
|
badusage=False):
|
||||||
now = datetime.datetime.now(tz=datetime.UTC) + warp
|
now = datetime.datetime.now(tz=datetime.timezone.utc) + warp
|
||||||
|
|
||||||
builder = builder.not_valid_before(now)
|
builder = builder.not_valid_before(now)
|
||||||
builder = builder.not_valid_after(now + YEAR)
|
builder = builder.not_valid_after(now + YEAR)
|
||||||
@@ -347,7 +347,7 @@ def gen_cert(profile, nick_base, subject, ca=None, **kwargs):
|
|||||||
|
|
||||||
|
|
||||||
def revoke_cert(ca, serial):
|
def revoke_cert(ca, serial):
|
||||||
now = datetime.datetime.now(tz=datetime.UTC)
|
now = datetime.datetime.now(tz=datetime.timezone.utc)
|
||||||
|
|
||||||
crl_builder = x509.CertificateRevocationListBuilder()
|
crl_builder = x509.CertificateRevocationListBuilder()
|
||||||
crl_builder = crl_builder.issuer_name(ca.cert.subject)
|
crl_builder = crl_builder.issuer_name(ca.cert.subject)
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
import os
|
||||||
|
|
||||||
|
import ipalib
|
||||||
|
from ipaplatform.paths import paths
|
||||||
|
|
||||||
|
# authenticate with host keytab and custom ccache
|
||||||
|
os.environ.update(
|
||||||
|
KRB5_CLIENT_KTNAME=paths.KRB5_KEYTAB,
|
||||||
|
)
|
||||||
|
|
||||||
|
# custom options
|
||||||
|
overrides = {"context": "example_cli"}
|
||||||
|
ipalib.api.bootstrap(**overrides)
|
||||||
|
|
||||||
|
with ipalib.api as api:
|
||||||
|
user = api.Command.user_show("admin")
|
||||||
|
print(user)
|
||||||
|
|
||||||
|
assert not api.Backend.rpcclient.isconnected()
|
||||||
@@ -604,7 +604,7 @@ def issue_and_expire_acme_cert():
|
|||||||
# move system date to expire acme cert
|
# move system date to expire acme cert
|
||||||
for host in hosts:
|
for host in hosts:
|
||||||
tasks.kdestroy_all(host)
|
tasks.kdestroy_all(host)
|
||||||
tasks.move_date(host, 'stop', '+90days+60minutes')
|
tasks.move_date(host, 'stop', '+90days+2hours')
|
||||||
|
|
||||||
# restart ipa services as date moved and wait to get things settle
|
# restart ipa services as date moved and wait to get things settle
|
||||||
time.sleep(10)
|
time.sleep(10)
|
||||||
@@ -630,7 +630,7 @@ def issue_and_expire_acme_cert():
|
|||||||
|
|
||||||
# move back date
|
# move back date
|
||||||
for host in hosts:
|
for host in hosts:
|
||||||
tasks.move_date(host, 'start', '-90days-60minutes')
|
tasks.move_date(host, 'start', '-90days-2hours')
|
||||||
|
|
||||||
# restart ipa services as date moved and wait to get things settle
|
# restart ipa services as date moved and wait to get things settle
|
||||||
# if the internal fixture was not called (for instance because the test
|
# if the internal fixture was not called (for instance because the test
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import random
|
|||||||
import shlex
|
import shlex
|
||||||
import ssl
|
import ssl
|
||||||
from itertools import chain, repeat
|
from itertools import chain, repeat
|
||||||
|
import sys
|
||||||
import textwrap
|
import textwrap
|
||||||
import time
|
import time
|
||||||
import pytest
|
import pytest
|
||||||
@@ -1557,6 +1558,34 @@ class TestIPACommand(IntegrationTest):
|
|||||||
|
|
||||||
assert 'Discovered server %s' % self.master.hostname in result
|
assert 'Discovered server %s' % self.master.hostname in result
|
||||||
|
|
||||||
|
def test_ipa_context_manager(self):
|
||||||
|
"""Exercise ipalib.api context manager and KRB5_CLIENT_KTNAME auth
|
||||||
|
|
||||||
|
The example_cli.py script uses the context manager to connect and
|
||||||
|
disconnect the global ipalib.api object. The test also checks whether
|
||||||
|
KRB5_CLIENT_KTNAME env var automatically acquires a TGT.
|
||||||
|
"""
|
||||||
|
host = self.clients[0]
|
||||||
|
tasks.kdestroy_all(host)
|
||||||
|
|
||||||
|
here = os.path.abspath(os.path.dirname(__file__))
|
||||||
|
with open(os.path.join(here, "example_cli.py")) as f:
|
||||||
|
contents = f.read()
|
||||||
|
|
||||||
|
# upload script and run with Python executable
|
||||||
|
script = "/tmp/example_cli.py"
|
||||||
|
host.put_file_contents(script, contents)
|
||||||
|
result = host.run_command([sys.executable, script])
|
||||||
|
|
||||||
|
# script prints admin account
|
||||||
|
admin_princ = f"admin@{host.domain.realm}"
|
||||||
|
assert admin_princ in result.stdout_text
|
||||||
|
|
||||||
|
# verify that auto-login did use correct principal
|
||||||
|
host_princ = f"host/{host.hostname}@{host.domain.realm}"
|
||||||
|
result = host.run_command([paths.KLIST])
|
||||||
|
assert host_princ in result.stdout_text
|
||||||
|
|
||||||
|
|
||||||
class TestIPACommandWithoutReplica(IntegrationTest):
|
class TestIPACommandWithoutReplica(IntegrationTest):
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -467,7 +467,8 @@ class TestEPN(IntegrationTest):
|
|||||||
extra_args=[
|
extra_args=[
|
||||||
"--password-expiration",
|
"--password-expiration",
|
||||||
datetime_to_generalized_time(
|
datetime_to_generalized_time(
|
||||||
datetime.datetime.now(tz=datetime.UTC) + datetime.timedelta(
|
datetime.datetime.now(
|
||||||
|
tz=datetime.timezone.utc) + datetime.timedelta(
|
||||||
days=7)
|
days=7)
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
@@ -496,7 +497,8 @@ class TestEPN(IntegrationTest):
|
|||||||
uid=uid,
|
uid=uid,
|
||||||
days=i,
|
days=i,
|
||||||
krbpasswordexpiration=datetime_to_generalized_time(
|
krbpasswordexpiration=datetime_to_generalized_time(
|
||||||
datetime.datetime.now(tz=datetime.UTC) + datetime.timedelta(
|
datetime.datetime.now(
|
||||||
|
tz=datetime.timezone.utc) + datetime.timedelta(
|
||||||
days=i)
|
days=i)
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
@@ -812,7 +814,8 @@ class TestEPN(IntegrationTest):
|
|||||||
self.master.run_command(
|
self.master.run_command(
|
||||||
['ipa', 'user-mod', 'admin', '--password-expiration',
|
['ipa', 'user-mod', 'admin', '--password-expiration',
|
||||||
datetime_to_generalized_time(
|
datetime_to_generalized_time(
|
||||||
datetime.datetime.now(tz=datetime.UTC) + datetime.timedelta(
|
datetime.datetime.now(
|
||||||
|
tz=datetime.timezone.utc) + datetime.timedelta(
|
||||||
days=7)
|
days=7)
|
||||||
)]
|
)]
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -408,6 +408,9 @@ class TestCertFixReplica(IntegrationTest):
|
|||||||
# move system date to expire certs
|
# move system date to expire certs
|
||||||
for host in self.master, self.replicas[0]:
|
for host in self.master, self.replicas[0]:
|
||||||
tasks.move_date(host, 'stop', '+3years+1days')
|
tasks.move_date(host, 'stop', '+3years+1days')
|
||||||
|
host.run_command(
|
||||||
|
['ipactl', 'restart', '--ignore-service-failures']
|
||||||
|
)
|
||||||
|
|
||||||
yield
|
yield
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,8 @@ Tests to verify that the ipa-healthcheck scenarios
|
|||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
|
||||||
from configparser import RawConfigParser, NoOptionError
|
from configparser import RawConfigParser, NoOptionError
|
||||||
from datetime import datetime, timedelta, UTC
|
from datetime import datetime, timedelta, timezone
|
||||||
|
UTC = timezone.utc
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
|
|||||||
@@ -234,8 +234,10 @@ class test_x509:
|
|||||||
# Verify certificate contents. This exercises python-cryptography
|
# Verify certificate contents. This exercises python-cryptography
|
||||||
# more than anything but confirms our usage of it.
|
# more than anything but confirms our usage of it.
|
||||||
|
|
||||||
not_before = datetime.datetime(2010, 6, 25, 13, 0, 42, 0, datetime.UTC)
|
not_before = datetime.datetime(2010, 6, 25, 13, 0, 42, 0,
|
||||||
not_after = datetime.datetime(2015, 6, 25, 13, 0, 42, 0, datetime.UTC)
|
datetime.timezone.utc)
|
||||||
|
not_after = datetime.datetime(2015, 6, 25, 13, 0, 42, 0,
|
||||||
|
datetime.timezone.utc)
|
||||||
cert = x509.load_pem_x509_certificate(goodcert_headers)
|
cert = x509.load_pem_x509_certificate(goodcert_headers)
|
||||||
|
|
||||||
assert DN(cert.subject) == DN(('CN', 'ipa.example.com'), ('O', 'IPA'))
|
assert DN(cert.subject) == DN(('CN', 'ipa.example.com'), ('O', 'IPA'))
|
||||||
@@ -279,8 +281,10 @@ class test_x509:
|
|||||||
assert DN(cert.issuer) == DN(
|
assert DN(cert.issuer) == DN(
|
||||||
"CN=Let's Encrypt Authority X3,O=Let's Encrypt,C=US")
|
"CN=Let's Encrypt Authority X3,O=Let's Encrypt,C=US")
|
||||||
assert cert.serial_number == 0x03ad42a2a5ada59a131327cb0979623cb605
|
assert cert.serial_number == 0x03ad42a2a5ada59a131327cb0979623cb605
|
||||||
not_before = datetime.datetime(2018, 7, 25, 5, 36, 59, 0, datetime.UTC)
|
not_before = datetime.datetime(2018, 7, 25, 5, 36, 59, 0,
|
||||||
not_after = datetime.datetime(2018, 10, 23, 5, 36, 59, 0, datetime.UTC)
|
datetime.timezone.utc)
|
||||||
|
not_after = datetime.datetime(2018, 10, 23, 5, 36, 59, 0,
|
||||||
|
datetime.timezone.utc)
|
||||||
assert cert.not_valid_before == not_before
|
assert cert.not_valid_before == not_before
|
||||||
assert cert.not_valid_after == not_after
|
assert cert.not_valid_after == not_after
|
||||||
assert cert.san_general_names == [DNSName('ipa.demo1.freeipa.org')]
|
assert cert.san_general_names == [DNSName('ipa.demo1.freeipa.org')]
|
||||||
|
|||||||
@@ -402,7 +402,9 @@ class TestHTTPReturn:
|
|||||||
assert cookie.http_return_ok(self.url)
|
assert cookie.http_return_ok(self.url)
|
||||||
|
|
||||||
def test_expires(self):
|
def test_expires(self):
|
||||||
now = datetime.datetime.now(tz=datetime.UTC).replace(microsecond=0)
|
now = datetime.datetime.now(
|
||||||
|
tz=datetime.timezone.utc).replace(
|
||||||
|
microsecond=0)
|
||||||
|
|
||||||
# expires 1 day from now
|
# expires 1 day from now
|
||||||
expires = now + datetime.timedelta(days=1)
|
expires = now + datetime.timedelta(days=1)
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
# Copyright (C) 2018 FreeIPA Contributors see COPYING for license
|
# Copyright (C) 2018 FreeIPA Contributors see COPYING for license
|
||||||
#
|
#
|
||||||
|
|
||||||
from datetime import datetime, timedelta, UTC
|
from datetime import datetime, timedelta, timezone
|
||||||
|
UTC = timezone.utc
|
||||||
from cryptography import x509
|
from cryptography import x509
|
||||||
from cryptography.hazmat.backends import default_backend
|
from cryptography.hazmat.backends import default_backend
|
||||||
from cryptography.hazmat.primitives import serialization, hashes
|
from cryptography.hazmat.primitives import serialization, hashes
|
||||||
|
|||||||
@@ -473,14 +473,23 @@ class test_cert_revocation(BaseCert):
|
|||||||
add=True, all=True)['result']
|
add=True, all=True)['result']
|
||||||
serial_number = res['serial_number']
|
serial_number = res['serial_number']
|
||||||
|
|
||||||
|
# REMOVE_FROM_CRL (8) needs to be on hold to revoke per RFC 5280
|
||||||
|
if reason == 8:
|
||||||
|
assert 'result' in api.Command['cert_revoke'](
|
||||||
|
serial_number, revocation_reason=6)
|
||||||
|
|
||||||
# revoke created certificate
|
# revoke created certificate
|
||||||
assert 'result' in api.Command['cert_revoke'](
|
assert 'result' in api.Command['cert_revoke'](
|
||||||
serial_number, revocation_reason=reason)
|
serial_number, revocation_reason=reason)
|
||||||
|
|
||||||
# verify that certificate is revoked with correct reason
|
# verify that certificate is revoked with correct reason
|
||||||
res2 = api.Command['cert_show'](serial_number, all=True)['result']
|
res2 = api.Command['cert_show'](serial_number, all=True)['result']
|
||||||
assert res2['revoked']
|
|
||||||
assert res2['revocation_reason'] == reason
|
if reason == 8:
|
||||||
|
assert res2['revoked'] is False
|
||||||
|
else:
|
||||||
|
assert res2['revoked']
|
||||||
|
assert res2['revocation_reason'] == reason
|
||||||
|
|
||||||
# remove host
|
# remove host
|
||||||
assert 'result' in api.Command['host_del'](self.host_fqdn)
|
assert 'result' in api.Command['host_del'](self.host_fqdn)
|
||||||
|
|||||||
@@ -166,6 +166,20 @@ def user_radius(request, xmlrpc_setup):
|
|||||||
return tracker.make_fixture(request)
|
return tracker.make_fixture(request)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture(scope='class')
|
||||||
|
def user_idp(request, xmlrpc_setup):
|
||||||
|
""" User tracker fixture for testing users with idp user id """
|
||||||
|
tracker = UserTracker(name='idpuser', givenname='idp',
|
||||||
|
sn='user', ipaidpsub='myidpuserid')
|
||||||
|
tracker.track_create()
|
||||||
|
tracker.attrs.update(ipaidpsub=['myidpuserid'])
|
||||||
|
tracker.attrs.update(objectclass=fuzzy_set_optional_oc(
|
||||||
|
objectclasses.user + [u'ipaidpuser'],
|
||||||
|
'ipantuserattrs'),
|
||||||
|
)
|
||||||
|
return tracker.make_fixture(request)
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope='class')
|
@pytest.fixture(scope='class')
|
||||||
def group(request, xmlrpc_setup):
|
def group(request, xmlrpc_setup):
|
||||||
tracker = GroupTracker(name=u'group1')
|
tracker = GroupTracker(name=u'group1')
|
||||||
@@ -557,6 +571,15 @@ class TestUpdate(XMLRPC_test):
|
|||||||
)):
|
)):
|
||||||
command()
|
command()
|
||||||
|
|
||||||
|
def test_update_add_idpsub(self, user):
|
||||||
|
""" Test user-mod --idp-user-id"""
|
||||||
|
user.ensure_exists()
|
||||||
|
command = user.make_update_command(
|
||||||
|
updates=dict(ipaidpsub=u'myidp_user_id')
|
||||||
|
)
|
||||||
|
command()
|
||||||
|
user.delete()
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.tier1
|
@pytest.mark.tier1
|
||||||
class TestCreate(XMLRPC_test):
|
class TestCreate(XMLRPC_test):
|
||||||
@@ -796,6 +819,13 @@ class TestCreate(XMLRPC_test):
|
|||||||
)):
|
)):
|
||||||
testuser.create()
|
testuser.create()
|
||||||
|
|
||||||
|
def test_create_with_idpsub(self, user_idp):
|
||||||
|
""" Test creation of a user with --idp-user-id"""
|
||||||
|
command = user_idp.make_create_command()
|
||||||
|
result = command()
|
||||||
|
user_idp.check_create(result, ['ipaidpsub'])
|
||||||
|
user_idp.delete()
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.tier1
|
@pytest.mark.tier1
|
||||||
class TestUserWithGroup(XMLRPC_test):
|
class TestUserWithGroup(XMLRPC_test):
|
||||||
|
|||||||
+8241
-8240
File diff suppressed because it is too large.
Load diff
@@ -106,6 +106,8 @@ corenet_tcp_connect_radius_port(ipa_otpd_t)
|
|||||||
|
|
||||||
dev_read_urand(ipa_otpd_t)
|
dev_read_urand(ipa_otpd_t)
|
||||||
dev_read_rand(ipa_otpd_t)
|
dev_read_rand(ipa_otpd_t)
|
||||||
|
dev_read_sysfs(ipa_otpd_t)
|
||||||
|
dev_rw_generic_usb_dev(ipa_otpd_t)
|
||||||
|
|
||||||
sysnet_dns_name_resolve(ipa_otpd_t)
|
sysnet_dns_name_resolve(ipa_otpd_t)
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user