* Re: [PATCH] ovpnclients.dat: Fix adjusting input dates
[not found] <CAGGyJToTmYFsQMWG9Try1NE6fW91TQwU0gBxcQ0Y3pe18m2JWA@mail.gmail.com>
@ 2022-02-16 20:24 ` Peter Müller
0 siblings, 0 replies; 2+ messages in thread
From: Peter Müller @ 2022-02-16 20:24 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 6804 bytes --]
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.
>
> 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 repository_, 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/
>
> 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 paths
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 speaking,
the so-called LFS files (which can be found in the lfs/ directory) control which
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-dates.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]:/srv/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üller
>
> Thank you, Paul
>
>
>
> On Tue, Feb 15, 2022 at 6:40 AM Michael Tremer <michael.tremer(a)ipfire.org>
> wrote:
>
>> 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 <kairis(a)gmail.com>
>> Fixes: #12768
>> Tested-by: Jon Murphy <jon.murphy(a)ipfire.org>
>> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
>> ---
>> 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 = 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 = 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 = '$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
>>
>>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH] ovpnclients.dat: Fix adjusting input dates
@ 2022-02-15 13:40 Michael Tremer
0 siblings, 0 replies; 2+ messages in thread
From: Michael Tremer @ 2022-02-15 13:40 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3785 bytes --]
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 <kairis(a)gmail.com>
Fixes: #12768
Tested-by: Jon Murphy <jon.murphy(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
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 = 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 = 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 = '$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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-02-16 20:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <CAGGyJToTmYFsQMWG9Try1NE6fW91TQwU0gBxcQ0Y3pe18m2JWA@mail.gmail.com>
2022-02-16 20:24 ` [PATCH] ovpnclients.dat: Fix adjusting input dates Peter Müller
2022-02-15 13:40 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox