procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Recognise hybrid IPv6/IPv4 addresses in textsec (bug#54624)

Browse source 
* lisp/international/textsec.el (textsec--ipvx-address-p):
  Recognise hybrid addresses like "::ffff:129.55.2.201".
  Combine to a single regexp and translate to rx.
  Remove some regexp ambiguity (relint complaint).
* test/lisp/international/textsec-tests.el (test-suspiction-domain):
  Add test cases.
This commit is contained in:
Mattias Engdegård 2022-04-11 16:22:38 +02:00
parent a715f2fbe7
commit 26db1ca80e
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lisp/international/textsec.el
View file

@ -233,12 +233,18 @@ The scripts are as defined by the Unicode Standard Annex 24 (UAX#24)."
(defun textsec--ipvx-address-p (domain)
"Return non-nil if DOMAIN is an ipv4 or ipv6 address."
(or (string-match-p "\\`\\([0-9]\\{1,3\\}\\.?\\)\\{1,4\\}\\'" domain)
(let ((ipv6 "\\([0-9a-f]\\{0,4\\}:?\\)\\{1,8\\}"))
;; With brackets.
(or (string-match-p (format "\\`\\[%s\\]\\'" ipv6) domain)
;; Without.
(string-match-p (format "\\`%s\\'" ipv6) domain)))))
;; This is a very relaxed pattern for IPv4 or IPv6 addresses. The
;; assumption is that any malformed address accepted by this rule
;; will be rejected by the actual address parser eventually.
(rx-let ((ipv4 (** 1 4
(** 1 3 (in "0-9"))
(? ".")))
(ipv6 (: (** 1 7
(** 0 4 (in "0-9a-f"))
":")
(** 0 4 (in "0-9a-f"))
(? ":" ipv4))))
(string-match-p (rx bos (or ipv4 ipv6 (: "[" ipv6 "]")) eos) domain)))
(defun textsec-domain-suspicious-p (domain)
"Say whether DOMAIN's name looks suspicious.

5
test/lisp/international/textsec-tests.el
View file

@ -126,7 +126,10 @@
(should-not (textsec-domain-suspicious-p
"[21a:34aa:c782:3ad2:1bf8:73f8:141:66e8]"))
(should (textsec-domain-suspicious-p
"[21a:34aa:c782:3ad2:1bf8:73f8:141:66e8")))
"[21a:34aa:c782:3ad2:1bf8:73f8:141:66e8"))
(should-not (textsec-domain-suspicious-p "138.25.106.12"))
(should-not (textsec-domain-suspicious-p "2001:db8::ff00:42:8329"))
(should-not (textsec-domain-suspicious-p "::ffff:129.55.2.201")))
(ert-deftest test-suspicious-local ()
(should-not (textsec-local-address-suspicious-p "larsi"))