Software / code / prosody
Annotate
spec/util_datetime_spec.lua @ 13792:4ea7bd7325be 13.0
core.portmanager: Restore use of per-host 'ssl' for SNI hosts. Fixes #1915.
This was an unintentional regression, as per-host 'ssl' options became valid
in 0.12 when SNI support was added for direct TLS ports. While we encourage
most people to use the simpler automatic certificate selection (and it seems
most do, given the overlooking of this bug), there are likely always going to
be use cases for manually-configured certificates.
The issue was introduced in commit 7e9ebdc75ce4 which inadvertently removed
the per-host option checking for SNI.
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 29 Mar 2025 22:25:19 +0100 |
| parent | 12755:a09dacf660d2 |
| rev | line source |
|---|---|
| 8392 | 1 local util_datetime = require "util.datetime"; |
| 2 | |
| 3 describe("util.datetime", function () | |
| 4 it("should have been loaded", function () | |
| 5 assert.is_table(util_datetime); | |
| 6 end); | |
| 7 describe("#date", function () | |
| 8 local date = util_datetime.date; | |
| 9 it("should exist", function () | |
| 10 assert.is_function(date); | |
| 11 end); | |
| 12 it("should return a string", function () | |
| 13 assert.is_string(date()); | |
| 14 end); | |
| 15 it("should look like a date", function () | |
| 16 assert.truthy(string.find(date(), "^%d%d%d%d%-%d%d%-%d%d$")); | |
| 17 end); | |
| 18 it("should work", function () | |
|
12628
b95da9a593be
util.datetime: Fix argument order in tests
Kim Alvefur <zash@zash.se>
parents:
8392
diff
changeset
|
19 assert.equals("2006-01-02", date(1136239445)); |
| 8392 | 20 end); |
|
12629
4c1d3f817063
util.datetime: Add support for sub-second precision timestamps
Kim Alvefur <zash@zash.se>
parents:
12628
diff
changeset
|
21 it("should ignore fractional parts", function () |
|
4c1d3f817063
util.datetime: Add support for sub-second precision timestamps
Kim Alvefur <zash@zash.se>
parents:
12628
diff
changeset
|
22 assert.equals("2006-01-02", date(1136239445.5)); |
|
4c1d3f817063
util.datetime: Add support for sub-second precision timestamps
Kim Alvefur <zash@zash.se>
parents:
12628
diff
changeset
|
23 end); |
| 8392 | 24 end); |
| 25 describe("#time", function () | |
| 26 local time = util_datetime.time; | |
| 27 it("should exist", function () | |
| 28 assert.is_function(time); | |
| 29 end); | |
| 30 it("should return a string", function () | |
| 31 assert.is_string(time()); | |
| 32 end); | |
| 33 it("should look like a timestamp", function () | |
| 34 -- Note: Sub-second precision and timezones are ignored | |
| 35 assert.truthy(string.find(time(), "^%d%d:%d%d:%d%d")); | |
| 36 end); | |
| 37 it("should work", function () | |
|
12628
b95da9a593be
util.datetime: Fix argument order in tests
Kim Alvefur <zash@zash.se>
parents:
8392
diff
changeset
|
38 assert.equals("22:04:05", time(1136239445)); |
| 8392 | 39 end); |
|
12629
4c1d3f817063
util.datetime: Add support for sub-second precision timestamps
Kim Alvefur <zash@zash.se>
parents:
12628
diff
changeset
|
40 it("should handle precision", function () |
|
12755
a09dacf660d2
util.datetime: Add some missing test cases
Matthew Wild <mwild1@gmail.com>
parents:
12629
diff
changeset
|
41 assert.equal("14:46:31.158200", time(1660488391.1582)) |
|
12629
4c1d3f817063
util.datetime: Add support for sub-second precision timestamps
Kim Alvefur <zash@zash.se>
parents:
12628
diff
changeset
|
42 assert.equal("14:46:32.158200", time(1660488392.1582)) |
|
12755
a09dacf660d2
util.datetime: Add some missing test cases
Matthew Wild <mwild1@gmail.com>
parents:
12629
diff
changeset
|
43 assert.equal("14:46:33.158200", time(1660488393.1582)) |
|
a09dacf660d2
util.datetime: Add some missing test cases
Matthew Wild <mwild1@gmail.com>
parents:
12629
diff
changeset
|
44 assert.equal("14:46:33.999900", time(1660488393.9999)) |
|
12629
4c1d3f817063
util.datetime: Add support for sub-second precision timestamps
Kim Alvefur <zash@zash.se>
parents:
12628
diff
changeset
|
45 end) |
| 8392 | 46 end); |
| 47 describe("#datetime", function () | |
| 48 local datetime = util_datetime.datetime; | |
| 49 it("should exist", function () | |
| 50 assert.is_function(datetime); | |
| 51 end); | |
| 52 it("should return a string", function () | |
| 53 assert.is_string(datetime()); | |
| 54 end); | |
| 55 it("should look like a timestamp", function () | |
| 56 -- Note: Sub-second precision and timezones are ignored | |
| 57 assert.truthy(string.find(datetime(), "^%d%d%d%d%-%d%d%-%d%dT%d%d:%d%d:%d%d")); | |
| 58 end); | |
| 59 it("should work", function () | |
|
12628
b95da9a593be
util.datetime: Fix argument order in tests
Kim Alvefur <zash@zash.se>
parents:
8392
diff
changeset
|
60 assert.equals("2006-01-02T22:04:05Z", datetime(1136239445)); |
| 8392 | 61 end); |
|
12629
4c1d3f817063
util.datetime: Add support for sub-second precision timestamps
Kim Alvefur <zash@zash.se>
parents:
12628
diff
changeset
|
62 it("should handle precision", function () |
|
12755
a09dacf660d2
util.datetime: Add some missing test cases
Matthew Wild <mwild1@gmail.com>
parents:
12629
diff
changeset
|
63 assert.equal("2022-08-14T14:46:31.158200Z", datetime(1660488391.1582)) |
|
12629
4c1d3f817063
util.datetime: Add support for sub-second precision timestamps
Kim Alvefur <zash@zash.se>
parents:
12628
diff
changeset
|
64 assert.equal("2022-08-14T14:46:32.158200Z", datetime(1660488392.1582)) |
|
12755
a09dacf660d2
util.datetime: Add some missing test cases
Matthew Wild <mwild1@gmail.com>
parents:
12629
diff
changeset
|
65 assert.equal("2022-08-14T14:46:33.158200Z", datetime(1660488393.1582)) |
|
a09dacf660d2
util.datetime: Add some missing test cases
Matthew Wild <mwild1@gmail.com>
parents:
12629
diff
changeset
|
66 assert.equal("2022-08-14T14:46:33.999900Z", datetime(1660488393.9999)) |
|
12629
4c1d3f817063
util.datetime: Add support for sub-second precision timestamps
Kim Alvefur <zash@zash.se>
parents:
12628
diff
changeset
|
67 end) |
| 8392 | 68 end); |
| 69 describe("#legacy", function () | |
| 70 local legacy = util_datetime.legacy; | |
| 71 it("should exist", function () | |
| 72 assert.is_function(legacy); | |
| 73 end); | |
|
12755
a09dacf660d2
util.datetime: Add some missing test cases
Matthew Wild <mwild1@gmail.com>
parents:
12629
diff
changeset
|
74 it("should not add precision", function () |
|
a09dacf660d2
util.datetime: Add some missing test cases
Matthew Wild <mwild1@gmail.com>
parents:
12629
diff
changeset
|
75 assert.equal("20220814T14:46:31", legacy(1660488391.1582)); |
|
a09dacf660d2
util.datetime: Add some missing test cases
Matthew Wild <mwild1@gmail.com>
parents:
12629
diff
changeset
|
76 end); |
| 8392 | 77 end); |
| 78 describe("#parse", function () | |
| 79 local parse = util_datetime.parse; | |
| 80 it("should exist", function () | |
| 81 assert.is_function(parse); | |
| 82 end); | |
| 83 it("should work", function () | |
| 84 -- Timestamp used by Go | |
|
12628
b95da9a593be
util.datetime: Fix argument order in tests
Kim Alvefur <zash@zash.se>
parents:
8392
diff
changeset
|
85 assert.equals(1511114293, parse("2017-11-19T17:58:13Z")); |
|
b95da9a593be
util.datetime: Fix argument order in tests
Kim Alvefur <zash@zash.se>
parents:
8392
diff
changeset
|
86 assert.equals(1511114330, parse("2017-11-19T18:58:50+0100")); |
|
b95da9a593be
util.datetime: Fix argument order in tests
Kim Alvefur <zash@zash.se>
parents:
8392
diff
changeset
|
87 assert.equals(1136239445, parse("2006-01-02T15:04:05-0700")); |
|
12755
a09dacf660d2
util.datetime: Add some missing test cases
Matthew Wild <mwild1@gmail.com>
parents:
12629
diff
changeset
|
88 assert.equals(1136239445, parse("2006-01-02T15:04:05-07")); |
| 8392 | 89 end); |
| 90 it("should handle timezones", function () | |
| 91 -- https://xmpp.org/extensions/xep-0082.html#example-2 and 3 | |
| 92 assert.equals(parse("1969-07-21T02:56:15Z"), parse("1969-07-20T21:56:15-05:00")); | |
| 93 end); | |
|
12629
4c1d3f817063
util.datetime: Add support for sub-second precision timestamps
Kim Alvefur <zash@zash.se>
parents:
12628
diff
changeset
|
94 it("should handle precision", function () |
|
4c1d3f817063
util.datetime: Add support for sub-second precision timestamps
Kim Alvefur <zash@zash.se>
parents:
12628
diff
changeset
|
95 -- floating point comparison is not an exact science |
|
4c1d3f817063
util.datetime: Add support for sub-second precision timestamps
Kim Alvefur <zash@zash.se>
parents:
12628
diff
changeset
|
96 assert.truthy(math.abs(1660488392.1582 - parse("2022-08-14T14:46:32.158200Z")) < 0.001) |
|
4c1d3f817063
util.datetime: Add support for sub-second precision timestamps
Kim Alvefur <zash@zash.se>
parents:
12628
diff
changeset
|
97 end) |
|
12755
a09dacf660d2
util.datetime: Add some missing test cases
Matthew Wild <mwild1@gmail.com>
parents:
12629
diff
changeset
|
98 it("should return nil when given invalid inputs", function () |
|
a09dacf660d2
util.datetime: Add some missing test cases
Matthew Wild <mwild1@gmail.com>
parents:
12629
diff
changeset
|
99 assert.is_nil(parse(nil)); |
|
a09dacf660d2
util.datetime: Add some missing test cases
Matthew Wild <mwild1@gmail.com>
parents:
12629
diff
changeset
|
100 assert.is_nil(parse("hello world")); |
|
a09dacf660d2
util.datetime: Add some missing test cases
Matthew Wild <mwild1@gmail.com>
parents:
12629
diff
changeset
|
101 assert.is_nil(parse("2017-11-19T18:58:50$0100")); |
|
a09dacf660d2
util.datetime: Add some missing test cases
Matthew Wild <mwild1@gmail.com>
parents:
12629
diff
changeset
|
102 end); |
| 8392 | 103 end); |
| 104 end); |
