1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
Description: use only ICANN part in public suffix list
Origin: backport, https://github.com/noxxi/p5-io-socket-ssl/commit/1f9482771fd8d71083a2e388634b3787bd9fe147
Bug-Debian: https://bugs.debian.org/767692
Forwarded: not-needed
Author: Steffen Ullrich <Steffen_Ullrich@genua.de>
Reviewed-by: Salvatore Bonaccorso <carnil@debian.org>
Last-Update: 2014-11-01
---
diff --git a/lib/IO/Socket/SSL/PublicSuffix.pm b/lib/IO/Socket/SSL/PublicSuffix.pm
index 87c8b0b..a84aacd 100644
--- a/lib/IO/Socket/SSL/PublicSuffix.pm
+++ b/lib/IO/Socket/SSL/PublicSuffix.pm
@@ -293,10 +293,8 @@ sub public_suffix {
sub _default_data {
if ( ! defined $data ) {
$data = do { local $/; <DATA> };
- # known exceptions of behavior of SSL certificates from PSL
- $data .= "!googleapis.com\n";
- $data .= "!s3.amazonaws.com\n"; # RT#99702
-
+ $data =~s{^// ===END ICANN DOMAINS.*}{}ms
+ or die "cannot find END ICANN DOMAINS";
}
return $data;
}
diff --git a/t/public_suffix_lib.pl b/t/public_suffix_lib.pl
index 66bdfe4..a9dc4c8 100644
--- a/t/public_suffix_lib.pl
+++ b/t/public_suffix_lib.pl
@@ -30,7 +30,7 @@ sub run_with_lib {
require IO::Socket::SSL::PublicSuffix;
- plan tests => 83;
+ plan tests => 79;
# all one-level, but co.uk two-level
@@ -117,10 +117,14 @@ sub run_with_lib {
is public_suffix('example.com'), 'com';
is public_suffix('b.example.com'), 'com';
is public_suffix('a.b.example.com'), 'com';
- is public_suffix('uk.com'), 'uk.com';
- is public_suffix('example.uk.com'), 'uk.com';
- is public_suffix('b.example.uk.com'), 'uk.com';
- is public_suffix('a.b.example.uk.com'), 'uk.com';
+
+ # uk.com is not in the ICANN part of the list
+ if(0) {
+ is public_suffix('uk.com'), 'uk.com';
+ is public_suffix('example.uk.com'), 'uk.com';
+ is public_suffix('b.example.uk.com'), 'uk.com';
+ is public_suffix('a.b.example.uk.com'), 'uk.com';
+ }
is public_suffix('test.ac'), 'ac';
# TLD with only one (wildcard) rule:
--
2.1.1
|
