From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?utf-8?q?M=C3=BCller?= To: development@lists.ipfire.org Subject: Re: [PATCH] ovpnclients.dat: Fix adjusting input dates Date: Wed, 16 Feb 2022 20:24:22 +0000 Message-ID: In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5913086814496288240==" List-Id: --===============5913086814496288240== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello Paul, thanks for your reply. > I'm not sure this patch is created correctly. > I'm learning about patch so I can figure out how to apply these changes and > test. >=20 > The actual path of the original file is: > /srv/web/ipfire/cgi-bin/logs.cgi/ovpnclients.dat Well, it depends. On an IPFire _installation_ yes. In the IPFire _source repo= sitory_, no. > the patch points to diff --git a/html/cgi-bin/logs.cgi/ovpnclients.dat > b/html/cgi-bin/logs.cgi/ovpnclients.dat > but there is no cgi-bin/ under html/ >=20 > Please advise or better yet, give me a short primer on how to apply the > patch. It is important (yet continues to be confusing) to understand that the paths = of files found on an installed IPFire do not necessarily have to to match the pa= ths in the Git repository of IPFire. For example, as you already noticed, the ovpnclients.dat CGI is located in html/cgi-bin/logs.cgi/ovpnclients.dat in the Git repository. Generally speaki= ng, the so-called LFS files (which can be found in the lfs/ directory) control wh= ich file will be copied into which location for the actual IPFire installation. Should this be rather sketchy in theory to you, you might want to: 1. Clone the Git repository into a folder on your workstation: git clone https://git.ipfire.org/pub/git/ipfire-2.x.git 2. Change into that folder, create a temporary branch (not strictly required,= but keeps the "master" branch clean): cd ipfire-2.x git checkout -b temp-ovpnclients-patch 3. Download the patch and apply it: wget https://patchwork.ipfire.org/project/ipfire/patch/20220215134027.773437= -1-michael.tremer(a)ipfire.org/mbox/ -O ovpnclients.dat-Fix-adjusting-input-d= ates.patch git am ovpnclients.dat-Fix-adjusting-input-dates.patch 4. Afterwards, html/cgi-bin/logs.cgi/ovpnclients.dat will look like it should to solve the issue. You can then copy that CGI to an IPFire installation to see the changes in production: scp html/cgi-bin/logs.cgi/ovpnclients.dat root@[IPFire FQDN/IP goes here]:/s= rv/web/ipfire/cgi-bin/logs.cgi/ovpnclients.dat No additional command on the destination machine should be necessary. Just= reload the browser tab. Sorry for the confusions caused. I hope to have helped. :-) Thanks, and best regards, Peter M=C3=BCller >=20 > Thank you, Paul >=20 >=20 >=20 > On Tue, Feb 15, 2022 at 6:40 AM Michael Tremer > wrote: >=20 >> This patch changes that we no longer interpret any dates put in by the >> user as UTC. They used to be converted into localtime because, although >> they have already been in local time. >> >> This went unnoticed since in Europe we are close (enough) to UTC that >> there is no significant discrepancy on the report. However, being in >> North America is enough to generate confusing reports. >> >> Reported-by: Paul >> Fixes: #12768 >> Tested-by: Jon Murphy >> Signed-off-by: Michael Tremer >> --- >> html/cgi-bin/logs.cgi/ovpnclients.dat | 16 ++++++++-------- >> 1 file changed, 8 insertions(+), 8 deletions(-) >> >> diff --git a/html/cgi-bin/logs.cgi/ovpnclients.dat >> b/html/cgi-bin/logs.cgi/ovpnclients.dat >> index 5e2c1ff49..100573214 100755 >> --- a/html/cgi-bin/logs.cgi/ovpnclients.dat >> +++ b/html/cgi-bin/logs.cgi/ovpnclients.dat >> @@ -115,16 +115,16 @@ my $database_query =3D qq( >> common_name, SUM( >> STRFTIME('%s', ( >> CASE >> - WHEN DATETIME(COALESCE(disconnected_at, >> CURRENT_TIMESTAMP), 'localtime') < DATETIME('$to_datestring', 'localtime', >> 'start of day', '+86399 seconds') >> + WHEN DATETIME(COALESCE(disconnected_at, >> CURRENT_TIMESTAMP), 'localtime') < DATETIME('$to_datestring', 'start of >> day', '+86399 seconds') >> THEN >> DATETIME(COALESCE(disconnected_at, CURRENT_TIMESTAMP), 'localtime') >> - ELSE DATETIME('$to_datestring', >> 'localtime', 'start of day', '+86399 seconds') >> + ELSE DATETIME('$to_datestring', >> 'start of day', '+86399 seconds') >> END >> ), 'utc') - >> STRFTIME('%s', ( >> CASE >> - WHEN DATETIME(connected_at, 'localtime') >>> DATETIME('$from_datestring', 'localtime', 'start of day') >> + WHEN DATETIME(connected_at, 'localtime') >>> DATETIME('$from_datestring', 'start of day') >> THEN DATETIME(connected_at, >> 'localtime') >> - ELSE DATETIME('$from_datestring', >> 'localtime', 'start of day') >> + ELSE DATETIME('$from_datestring', >> 'start of day') >> END >> ), 'utc') >> ) AS duration >> @@ -133,10 +133,10 @@ my $database_query =3D qq( >> ( >> disconnected_at IS NULL >> OR >> - DATETIME(disconnected_at, 'localtime') > >> DATETIME('$from_datestring', 'localtime', 'start of day') >> + DATETIME(disconnected_at, 'localtime') > >> DATETIME('$from_datestring', 'start of day') >> ) >> AND >> - DATETIME(connected_at, 'localtime') < >> DATETIME('$to_datestring', 'localtime', 'start of day', '+86399 seconds') >> + DATETIME(connected_at, 'localtime') < >> DATETIME('$to_datestring', 'start of day', '+86399 seconds') >> GROUP BY common_name >> ORDER BY common_name, duration DESC; >> ); >> @@ -148,9 +148,9 @@ if ($cgiparams{'CONNECTION_NAME'}) { >> WHERE >> common_name =3D '$cgiparams{"CONNECTION_NAME"}' >> AND ( >> - DATETIME(disconnected_at, 'localtime') > >> DATETIME('$from_datestring', 'localtime', 'start of day') >> + DATETIME(disconnected_at, 'localtime') > >> DATETIME('$from_datestring', 'start of day') >> AND >> - DATETIME(connected_at, 'localtime') < >> DATETIME('$to_datestring', 'localtime', 'start of day', '+86399 seconds') >> + DATETIME(connected_at, 'localtime') < >> DATETIME('$to_datestring', 'start of day', '+86399 seconds') >> ) >> ORDER BY connected_at; >> ); >> -- >> 2.30.2 >> >> >=20 --===============5913086814496288240==--