mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
python 3.12: utcnow function is deprecated
The following warning is displayed on a system running with Python 3.12: ------------------- /usr/lib/python3.12/site-packages/ipalib/rpc.py:925: DeprecationWarning: datetime.utcnow() is deprecated and scheduled for removal in a future version. Use timezone-aware objects to represent datetimes in UTC: datetime.now(datetime.UTC). timestamp=datetime.datetime.utcnow()) ------------------- Fixes: https://pagure.io/freeipa/issue/9425 Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com> Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
This commit is contained in:
parent
bbb53a1271
commit
09497d2df0
@ -33,7 +33,7 @@ import ssl
|
||||
import time
|
||||
|
||||
from collections import deque
|
||||
from datetime import datetime, timedelta
|
||||
from datetime import datetime, timedelta, UTC
|
||||
from email.utils import formataddr, formatdate
|
||||
from email.mime.multipart import MIMEMultipart
|
||||
from email.mime.text import MIMEText
|
||||
@ -337,7 +337,7 @@ class EPN(admintool.AdminTool):
|
||||
of days in the future.
|
||||
If only nbdays_end is specified, the range is 1d long.
|
||||
"""
|
||||
now = datetime.utcnow()
|
||||
now = datetime.now(tz=UTC)
|
||||
today_at_midnight = datetime.combine(now, datetime.min.time())
|
||||
range_end = today_at_midnight + timedelta(days=nbdays_end)
|
||||
if nbdays_start is not None:
|
||||
@ -568,7 +568,7 @@ class EPN(admintool.AdminTool):
|
||||
mail_from=mail_from,
|
||||
mail_from_name=api.env.mail_from_name,
|
||||
)
|
||||
now = datetime.utcnow()
|
||||
now = datetime.now(tz=UTC)
|
||||
expdate = datetime.strptime(
|
||||
entry["krbpasswordexpiration"],
|
||||
'%Y-%m-%d %H:%M:%S')
|
||||
@ -583,7 +583,7 @@ class EPN(admintool.AdminTool):
|
||||
def _gentestdata(self):
|
||||
"""Generate a sample user to process through the template.
|
||||
"""
|
||||
expdate = datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S')
|
||||
expdate = datetime.now(tz=UTC).strftime('%Y-%m-%d %H:%M:%S')
|
||||
entry = dict(
|
||||
uid=["SAUSER"],
|
||||
cn=["SAMPLE USER"],
|
||||
|
@ -1836,7 +1836,7 @@ class DateTime(Param):
|
||||
def _convert_scalar(self, value, index=None):
|
||||
if isinstance(value, str):
|
||||
if value == u'now':
|
||||
time = datetime.datetime.utcnow()
|
||||
time = datetime.datetime.now(tz=datetime.UTC)
|
||||
return time
|
||||
else:
|
||||
for date_format in self.accepted_formats:
|
||||
|
@ -819,7 +819,7 @@ class KerbTransport(SSLTransport):
|
||||
session_cookie = (
|
||||
Cookie.get_named_cookie_from_string(
|
||||
cookie, COOKIE_NAME, request_url,
|
||||
timestamp=datetime.datetime.utcnow())
|
||||
timestamp=datetime.datetime.now(tz=datetime.UTC))
|
||||
)
|
||||
if session_cookie is not None:
|
||||
break
|
||||
@ -922,7 +922,7 @@ class RPCClient(Connectible):
|
||||
try:
|
||||
session_cookie = Cookie.get_named_cookie_from_string(
|
||||
cookie_string, COOKIE_NAME,
|
||||
timestamp=datetime.datetime.utcnow())
|
||||
timestamp=datetime.datetime.now(tz=datetime.UTC))
|
||||
except Exception as e:
|
||||
logger.debug(
|
||||
'Error retrieving cookie from the persistent storage: %s',
|
||||
|
@ -266,11 +266,13 @@ class IPACertificate(crypto_x509.Certificate):
|
||||
|
||||
@property
|
||||
def not_valid_before(self):
|
||||
return self._cert.not_valid_before
|
||||
return datetime.datetime.fromtimestamp(
|
||||
self._cert.not_valid_before.timestamp(), tz=datetime.UTC)
|
||||
|
||||
@property
|
||||
def not_valid_after(self):
|
||||
return self._cert.not_valid_after
|
||||
return datetime.datetime.fromtimestamp(
|
||||
self._cert.not_valid_after.timestamp(), tz=datetime.UTC)
|
||||
|
||||
@property
|
||||
def tbs_certificate_bytes(self):
|
||||
|
@ -943,7 +943,7 @@ class NSSDatabase:
|
||||
def _verify_cert_validity(self, cert):
|
||||
"""Common checks for cert validity
|
||||
"""
|
||||
utcnow = datetime.datetime.utcnow()
|
||||
utcnow = datetime.datetime.now(tz=datetime.UTC)
|
||||
if cert.not_valid_before > utcnow:
|
||||
raise ValueError(
|
||||
f"not valid before {cert.not_valid_before} UTC is in the "
|
||||
|
@ -652,7 +652,7 @@ class Cookie:
|
||||
|
||||
cookie_expiration = self.get_expiration()
|
||||
if cookie_expiration is not None:
|
||||
now = datetime.datetime.utcnow()
|
||||
now = datetime.datetime.now(tz=datetime.UTC)
|
||||
if cookie_expiration < now:
|
||||
raise Cookie.Expired("cookie named '%s'; expired at %s'" % \
|
||||
(cookie_name,
|
||||
|
@ -740,7 +740,7 @@ class _CrossProcessLock:
|
||||
self._do(self._release, owner)
|
||||
|
||||
def _acquire(self, owner):
|
||||
now = datetime.datetime.utcnow()
|
||||
now = datetime.datetime.now(tz=datetime.UTC)
|
||||
|
||||
if self._locked and now >= self._expire:
|
||||
self._locked = False
|
||||
|
@ -556,7 +556,7 @@ class CACertManage(admintool.AdminTool):
|
||||
api.env.realm,
|
||||
False)
|
||||
|
||||
now = datetime.datetime.utcnow()
|
||||
now = datetime.datetime.now(tz=datetime.UTC)
|
||||
for ca_cert, ca_nickname, _ca_trust_flags in ca_certs:
|
||||
if ca_cert.not_valid_after < now:
|
||||
expired_certs.append(ca_nickname)
|
||||
|
@ -35,7 +35,7 @@ class ExternalCA:
|
||||
"""
|
||||
|
||||
def __init__(self, days=365, key_size=None):
|
||||
self.now = datetime.datetime.utcnow()
|
||||
self.now = datetime.datetime.now(tz=datetime.UTC)
|
||||
self.delta = datetime.timedelta(days=days)
|
||||
self.ca_key = None
|
||||
self.ca_public_key = None
|
||||
|
@ -102,7 +102,7 @@ class KRB5PrincipalName(univ.Sequence):
|
||||
|
||||
|
||||
def profile_ca(builder, ca_nick, ca):
|
||||
now = datetime.datetime.utcnow()
|
||||
now = datetime.datetime.now(tz=datetime.UTC)
|
||||
|
||||
builder = builder.not_valid_before(now)
|
||||
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,
|
||||
warp=datetime.timedelta(days=0), dns_name=None,
|
||||
badusage=False, wildcard=False):
|
||||
now = datetime.datetime.utcnow() + warp
|
||||
now = datetime.datetime.now(tz=datetime.UTC) + warp
|
||||
|
||||
builder = builder.not_valid_before(now)
|
||||
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,
|
||||
warp=datetime.timedelta(days=0), dns_name=None,
|
||||
badusage=False):
|
||||
now = datetime.datetime.utcnow() + warp
|
||||
now = datetime.datetime.now(tz=datetime.UTC) + warp
|
||||
|
||||
builder = builder.not_valid_before(now)
|
||||
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):
|
||||
now = datetime.datetime.utcnow()
|
||||
now = datetime.datetime.now(tz=datetime.UTC)
|
||||
|
||||
crl_builder = x509.CertificateRevocationListBuilder()
|
||||
crl_builder = crl_builder.issuer_name(ca.cert.subject)
|
||||
|
@ -467,7 +467,8 @@ class TestEPN(IntegrationTest):
|
||||
extra_args=[
|
||||
"--password-expiration",
|
||||
datetime_to_generalized_time(
|
||||
datetime.datetime.utcnow() + datetime.timedelta(days=7)
|
||||
datetime.datetime.now(tz=datetime.UTC) + datetime.timedelta(
|
||||
days=7)
|
||||
),
|
||||
],
|
||||
)
|
||||
@ -495,7 +496,8 @@ class TestEPN(IntegrationTest):
|
||||
uid=uid,
|
||||
days=i,
|
||||
krbpasswordexpiration=datetime_to_generalized_time(
|
||||
datetime.datetime.utcnow() + datetime.timedelta(days=i)
|
||||
datetime.datetime.now(tz=datetime.UTC) + datetime.timedelta(
|
||||
days=i)
|
||||
),
|
||||
)
|
||||
|
||||
@ -810,7 +812,8 @@ class TestEPN(IntegrationTest):
|
||||
self.master.run_command(
|
||||
['ipa', 'user-mod', 'admin', '--password-expiration',
|
||||
datetime_to_generalized_time(
|
||||
datetime.datetime.utcnow() + datetime.timedelta(days=7)
|
||||
datetime.datetime.now(tz=datetime.UTC) + datetime.timedelta(
|
||||
days=7)
|
||||
)]
|
||||
)
|
||||
(unused, stderr_text, _unused) = self._check_epn_output(
|
||||
|
@ -8,7 +8,7 @@ Tests to verify that the ipa-healthcheck scenarios
|
||||
from __future__ import absolute_import
|
||||
|
||||
from configparser import RawConfigParser, NoOptionError
|
||||
from datetime import datetime, timedelta
|
||||
from datetime import datetime, timedelta, UTC
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
@ -1547,7 +1547,7 @@ class TestIpaHealthCheck(IntegrationTest):
|
||||
tasks.uninstall_replica(self.master, self.replicas[0])
|
||||
|
||||
# Store the current date to restore at the end of the test
|
||||
now = datetime.utcnow()
|
||||
now = datetime.now(tz=UTC)
|
||||
now_str = datetime.strftime(now, "%Y-%m-%d %H:%M:%S Z")
|
||||
|
||||
# Pick a cert to find the upcoming expiration
|
||||
|
@ -234,8 +234,8 @@ class test_x509:
|
||||
# Verify certificate contents. This exercises python-cryptography
|
||||
# more than anything but confirms our usage of it.
|
||||
|
||||
not_before = datetime.datetime(2010, 6, 25, 13, 0, 42)
|
||||
not_after = datetime.datetime(2015, 6, 25, 13, 0, 42)
|
||||
not_before = datetime.datetime(2010, 6, 25, 13, 0, 42, 0, datetime.UTC)
|
||||
not_after = datetime.datetime(2015, 6, 25, 13, 0, 42, 0, datetime.UTC)
|
||||
cert = x509.load_pem_x509_certificate(goodcert_headers)
|
||||
|
||||
assert DN(cert.subject) == DN(('CN', 'ipa.example.com'), ('O', 'IPA'))
|
||||
@ -279,8 +279,8 @@ class test_x509:
|
||||
assert DN(cert.issuer) == DN(
|
||||
"CN=Let's Encrypt Authority X3,O=Let's Encrypt,C=US")
|
||||
assert cert.serial_number == 0x03ad42a2a5ada59a131327cb0979623cb605
|
||||
not_before = datetime.datetime(2018, 7, 25, 5, 36, 59)
|
||||
not_after = datetime.datetime(2018, 10, 23, 5, 36, 59)
|
||||
not_before = datetime.datetime(2018, 7, 25, 5, 36, 59, 0, datetime.UTC)
|
||||
not_after = datetime.datetime(2018, 10, 23, 5, 36, 59, 0, datetime.UTC)
|
||||
assert cert.not_valid_before == not_before
|
||||
assert cert.not_valid_after == not_after
|
||||
assert cert.san_general_names == [DNSName('ipa.demo1.freeipa.org')]
|
||||
|
@ -402,7 +402,7 @@ class TestHTTPReturn:
|
||||
assert cookie.http_return_ok(self.url)
|
||||
|
||||
def test_expires(self):
|
||||
now = datetime.datetime.utcnow().replace(microsecond=0)
|
||||
now = datetime.datetime.now(tz=datetime.UTC).replace(microsecond=0)
|
||||
|
||||
# expires 1 day from now
|
||||
expires = now + datetime.timedelta(days=1)
|
||||
|
@ -2,7 +2,7 @@
|
||||
# Copyright (C) 2018 FreeIPA Contributors see COPYING for license
|
||||
#
|
||||
|
||||
from datetime import datetime, timedelta
|
||||
from datetime import datetime, timedelta, UTC
|
||||
|
||||
from cryptography import x509
|
||||
from cryptography.hazmat.backends import default_backend
|
||||
@ -63,9 +63,9 @@ def generate_certificate(hostname):
|
||||
).serial_number(
|
||||
x509.random_serial_number()
|
||||
).not_valid_before(
|
||||
datetime.utcnow()
|
||||
datetime.now(tz=UTC)
|
||||
).not_valid_after(
|
||||
datetime.utcnow() + timedelta(days=100)
|
||||
datetime.now(tz=UTC) + timedelta(days=100)
|
||||
).add_extension(
|
||||
x509.SubjectAlternativeName([x509.DNSName(hostname)]),
|
||||
critical=False
|
||||
|
Loading…
Reference in New Issue
Block a user