From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 735246105D for ; Fri, 11 Sep 2020 14:35:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6AFC024C19 for ; Fri, 11 Sep 2020 14:34:51 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id A9DD824C0F for ; Fri, 11 Sep 2020 14:34:50 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 756C744B6C for ; Fri, 11 Sep 2020 14:34:50 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Fri, 11 Sep 2020 14:34:35 +0200 Message-Id: <20200911123439.1876094-3-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200911123439.1876094-1-f.gruenbichler@proxmox.com> References: <20200911123439.1876094-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.027 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [benchmark.rs, key.rs] Subject: [pbs-devel] [PATCH proxmox-backup 2/6] don't truncate DateTime nanoseconds X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Sep 2020 12:35:21 -0000 where we don't care about them anyway.. Signed-off-by: Fabian Grünbichler --- Note: this does not change visible behaviour AFAICT, but makes the code nicer to read IMHO.. src/backup/crypt_config.rs | 4 ++-- src/backup/key_derivation.rs | 4 ++-- src/bin/proxmox_backup_client/benchmark.rs | 4 ++-- src/bin/proxmox_backup_client/key.rs | 6 +++--- src/tools/file_logger.rs | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/backup/crypt_config.rs b/src/backup/crypt_config.rs index 72b56dd7..c30fb5fd 100644 --- a/src/backup/crypt_config.rs +++ b/src/backup/crypt_config.rs @@ -10,7 +10,7 @@ use std::io::Write; use anyhow::{bail, Error}; -use chrono::{Local, TimeZone, DateTime}; +use chrono::{Local, DateTime}; use openssl::hash::MessageDigest; use openssl::pkcs5::pbkdf2_hmac; use openssl::symm::{decrypt_aead, Cipher, Crypter, Mode}; @@ -219,7 +219,7 @@ impl CryptConfig { created: DateTime, ) -> Result, Error> { - let modified = Local.timestamp(Local::now().timestamp(), 0); + let modified = Local::now(); let key_config = super::KeyConfig { kdf: None, created, modified, data: self.enc_key.to_vec() }; let data = serde_json::to_string(&key_config)?.as_bytes().to_vec(); diff --git a/src/backup/key_derivation.rs b/src/backup/key_derivation.rs index 4befe525..ac27da63 100644 --- a/src/backup/key_derivation.rs +++ b/src/backup/key_derivation.rs @@ -1,7 +1,7 @@ use anyhow::{bail, format_err, Context, Error}; use serde::{Deserialize, Serialize}; -use chrono::{Local, TimeZone, DateTime}; +use chrono::{Local, DateTime}; use proxmox::tools::fs::{file_get_contents, replace_file, CreateOptions}; use proxmox::try_block; @@ -136,7 +136,7 @@ pub fn encrypt_key_with_passphrase( enc_data.extend_from_slice(&tag); enc_data.extend_from_slice(&encrypted_key); - let created = Local.timestamp(Local::now().timestamp(), 0); + let created = Local::now(); Ok(KeyConfig { kdf: Some(kdf), diff --git a/src/bin/proxmox_backup_client/benchmark.rs b/src/bin/proxmox_backup_client/benchmark.rs index 159b0c18..9830c183 100644 --- a/src/bin/proxmox_backup_client/benchmark.rs +++ b/src/bin/proxmox_backup_client/benchmark.rs @@ -3,7 +3,7 @@ use std::sync::Arc; use anyhow::{Error}; use serde_json::Value; -use chrono::{TimeZone, Utc}; +use chrono::Utc; use serde::Serialize; use proxmox::api::{ApiMethod, RpcEnvironment}; @@ -212,7 +212,7 @@ async fn test_upload_speed( verbose: bool, ) -> Result<(), Error> { - let backup_time = Utc.timestamp(Utc::now().timestamp(), 0); + let backup_time = Utc::now(); let client = connect(repo.host(), repo.user())?; record_repository(&repo); diff --git a/src/bin/proxmox_backup_client/key.rs b/src/bin/proxmox_backup_client/key.rs index f85e80c7..30afa4e5 100644 --- a/src/bin/proxmox_backup_client/key.rs +++ b/src/bin/proxmox_backup_client/key.rs @@ -1,7 +1,7 @@ use std::path::PathBuf; use anyhow::{bail, format_err, Error}; -use chrono::{Local, TimeZone}; +use chrono::Local; use serde::{Deserialize, Serialize}; use proxmox::api::api; @@ -112,7 +112,7 @@ fn create(kdf: Option, path: Option) -> Result<(), Error> { match kdf { Kdf::None => { - let created = Local.timestamp(Local::now().timestamp(), 0); + let created = Local::now(); store_key_config( &path, @@ -180,7 +180,7 @@ fn change_passphrase(kdf: Option, path: Option) -> Result<(), Error match kdf { Kdf::None => { - let modified = Local.timestamp(Local::now().timestamp(), 0); + let modified = Local::now(); store_key_config( &path, diff --git a/src/tools/file_logger.rs b/src/tools/file_logger.rs index 426e7b8d..c0fcab78 100644 --- a/src/tools/file_logger.rs +++ b/src/tools/file_logger.rs @@ -1,5 +1,5 @@ use anyhow::{Error}; -use chrono::{TimeZone, Local}; +use chrono::Local; use std::io::Write; /// Log messages with timestamps into files @@ -56,7 +56,7 @@ impl FileLogger { stdout.write_all(b"\n").unwrap(); } - let line = format!("{}: {}\n", Local.timestamp(Local::now().timestamp(), 0).to_rfc3339(), msg); + let line = format!("{}: {}\n", Local::now().to_rfc3339(), msg); self.file.write_all(line.as_bytes()).unwrap(); } } -- 2.20.1