Module:IPAddress - Revision history

Trialpears: Add isIpV4Range and isIpV6Range

2023-02-14T03:16:49Z

Add isIpV4Range and isIpV6Range

← Previous revision		Revision as of 03:16, 14 February 2023
Line 29:		Line 29:
	function p._isIp(s)		function p._isIp(s)
	return p._isIpV4(s) and "4" or p._isIpV6(s) and "6"		return p._isIpV4(s) and "4" or p._isIpV6(s) and "6"
			end

			function p._isIpV4Range(s)
			return p._isIpV4(s:gsub("/%d+$", "")) and (p._isIpOrRange(s) == 'range')
			end

			function p._isIpV6Range(s)
			return p._isIpV6(s:gsub("/%d+$", "")) and (p._isIpOrRange(s) == 'range')
	end		end

Line 55:		Line 63:
	function p.isIpV6(frame) return p._isIpV6(input(frame)) and "1" or "0" end		function p.isIpV6(frame) return p._isIpV6(input(frame)) and "1" or "0" end
	function p.isIpV4(frame) return p._isIpV4(input(frame)) and "1" or "0" end		function p.isIpV4(frame) return p._isIpV4(input(frame)) and "1" or "0" end
			function p.isIpV6Range(frame) return p._isIpV6Range(input(frame)) and "1" or "0" end
			function p.isIpV4Range(frame) return p._isIpV4Range(input(frame)) and "1" or "0" end
	function p.isIp(frame) return p._isIp(input(frame)) or "" end		function p.isIp(frame) return p._isIp(input(frame)) or "" end

Johnuniq: update from sandbox per edit request so a module can call function p._isIpOrRange(s)

2022-02-04T01:01:16Z

update from sandbox per edit request so a module can call function p._isIpOrRange(s)

@@ Line 29: / Line 29: @@
 function p._isIp(s)
 	return p._isIpV4(s) and "4" or p._isIpV6(s) and "6"
 end
@@ Line 46: / Line 59: @@
 function p.isIpOrRange(frame)
 	-- {{#invoke:IPAddress|isIpOrRange|x}} → 'ip' (IPv4/IPv6) or 'range' (CIDR IPv4/IPv6) or '' (invalid)
 end

Johnuniq: clean input to remove directional markers per MediaWiki talk:Blockedtext#Not detecting IPs properly

2021-07-19T07:25:10Z

clean input to remove directional markers per MediaWiki talk:Blockedtext#Not detecting IPs properly

← Previous revision		Revision as of 07:25, 19 July 2021
Line 21:		Line 21:

	function p._isIpV4(s)		function p._isIpV4(s)
	local function legal(n) return (tonumber(n) or 256) < 256 and not n:match("^0%d") end~~-- in lua 0 is true!~~		local function legal(n) return (tonumber(n) or 256) < 256 and not n:match("^0%d") end
	if type(s) ~= "string" then return false end		if type(s) ~= "string" then return false end
	local p1, p2, p3, p4 = s:match("^(%d+)%.(%d+)%.(%d+)%.(%d+)$")		local p1, p2, p3, p4 = s:match("^(%d+)%.(%d+)%.(%d+)%.(%d+)$")
Line 31:		Line 31:
	end		end

			local function input(frame)
⚫	function p.isIpV6(frame) return p._isIpV6(frame~~.args[1]~~) and "1" or "0" end
			-- Return input parameter after replacing any of following directional markers.
⚫	function p.isIpV4(frame) return p._isIpV4(frame~~.args[1]~~) and "1" or "0" end
			-- LRM : LEFT-TO-RIGHT MARK (U+200E) : hex e2 80 8e = 226 128 142
⚫	function p.isIp(frame) return p._isIp(frame~~.args[1]~~) or "" end
			-- LRE : LEFT-TO-RIGHT EMBEDDING (U+202A) : hex e2 80 aa = 226 128 170
			-- PDF : POP DIRECTIONAL FORMATTING (U+202C) : hex e2 80 ac = 226 128 172
			-- This is required for MediaWiki:Blockedtext message.
			return (frame.args[1] or ''):gsub('\226\128[\142\170\172]', ' ') -- replace LRM, LRE, PDF with space delimiter
			end

		⚫	function p.isIpV6(frame) return p._isIpV6(input(frame)) and "1" or "0" end
		⚫	function p.isIpV4(frame) return p._isIpV4(input(frame)) and "1" or "0" end
		⚫	function p.isIp(frame) return p._isIp(input(frame)) or "" end

	function p.isIpOrRange(frame)		function p.isIpOrRange(frame)
	-- {{#invoke:IPAddress\|isIpOrRange\|x}} → 'ip' (IPv4/IPv6) or 'range' (CIDR IPv4/IPv6) or '' (invalid)		-- {{#invoke:IPAddress\|isIpOrRange\|x}} → 'ip' (IPv4/IPv6) or 'range' (CIDR IPv4/IPv6) or '' (invalid)
	local modip = require('Module:IP')		local modip = require('Module:IP')
	local s = frame~~.args[1]~~		local s = input(frame)
	local success, ip = pcall(modip.IPAddress.new, s)		local success, ip = pcall(modip.IPAddress.new, s)
	if success then		if success then

Johnuniq: include changes from sandbox to remove global functions (undesirable and don't appear to be needed) and related to style; then can focus on proposed changes in sandbox

2021-06-01T04:56:43Z

include changes from sandbox to remove global functions (undesirable and don't appear to be needed) and related to style; then can focus on proposed changes in sandbox

← Previous revision		Revision as of 04:56, 1 June 2021
Line 1:		Line 1:
		⚫	local p = {}
	--[=[
	Functions are not "local", so other modules can require this module and call them directly.
	We return an object with 3 small stub functions to call the real ones so that the functions
	can be called from templates also.

		⚫	function p._isIpV6(s)
	Only [[dotted decimal]] notation for IPv4 supported. Does not support
	dotted hexadecimal, dotted octal, or single-number formats (see [[IPv4#Address_representations]]).

	Unit tests at Module:IPAddress/tests
	]=]

⚫	function _isIpV6( s )
	local dcolon, groups		local dcolon, groups
	if type( s ) ~= "string"		if type(s) ~= "string"
	or s:len() == 0		or s:len() == 0
	or s:find( "[^:%x]" ) -- only colon and hex digits are legal chars		or s:find("[^:%x]") -- only colon and hex digits are legal chars
	or s:find( "^:[^:]" ) -- can begin or end with :: but not with single :		or s:find("^:[^:]") -- can begin or end with :: but not with single :
	or s:find( "[^:]:$" )		or s:find("[^:]:$")
	or s:find( ":::" )		or s:find(":::")
	then		then
	return false		return false
	end		end
	s, dcolon = s:gsub( "::", ":" )		s, dcolon = s:gsub("::", ":")
	if dcolon > 1 then return false end -- at most one ::		if dcolon > 1 then return false end -- at most one ::
	s = s:gsub( "^:?", ":" ) -- prepend : if needed, upper		s = s:gsub("^:?", ":") -- prepend : if needed, upper
	s, groups = s:gsub( ":%x%x?%x?%x?", "" ) -- remove valid groups, and count them		s, groups = s:gsub(":%x%x?%x?%x?", "") -- remove valid groups, and count them
	return ( ( dcolon == 1 and groups < 8 ) or ( dcolon == 0 and groups == 8 ) )		return ( (dcolon == 1 and groups < 8) or (dcolon == 0 and groups == 8) )
	and ( s:len() == 0 or ( dcolon == 1 and s == ":" ) ) -- might be one dangling : if original ended with ::		and ( s:len() == 0 or (dcolon == 1 and s == ":") ) -- might be one dangling : if original ended with ::
	end		end

	function _isIpV4( s )		function p._isIpV4(s)
	local function legal( n ) return ( tonumber( n ) or 256 ) < 256 and not n:match("^0%d") end-- in lua 0 is true!		local function legal(n) return (tonumber(n) or 256) < 256 and not n:match("^0%d") end-- in lua 0 is true!
		⚫	if type(s) ~= "string" then return false end

		⚫	local p1, p2, p3, p4 = s:match("^(%d+)%.(%d+)%.(%d+)%.(%d+)$")
⚫	if type( s ) ~= "string" then return false end
		⚫	return legal(p1) and legal(p2) and legal(p3) and legal(p4)
⚫	local p1, p2, p3, p4 = s:match( "^(%d+)%.(%d+)%.(%d+)%.(%d+)$" )
⚫	return legal( p1 ) and legal( p2 ) and legal( p3 ) and legal( p4 )
	end		end

	function _isIp( s )		function p._isIp(s)
	return _isIpV4( s ) and "4" or _isIpV6( s ) and "6"		return p._isIpV4(s) and "4" or p._isIpV6(s) and "6"
	end		end

		⚫	function p.isIpV6(frame) return p._isIpV6(frame.args[1]) and "1" or "0" end
⚫	local p = {}
		⚫	function p.isIpV4(frame) return p._isIpV4(frame.args[1]) and "1" or "0" end

	function p.~~isIpV6~~(frame) return ~~_isIpV6~~( frame.args[ 1 ] ) ~~and "1"~~ or "0" end		function p.isIp(frame) return p._isIp(frame.args[1]) or "" end
⚫	function p.~~isIpV4~~(frame) return ~~_isIpV4~~( frame.args[ 1 ] ) and "1" or "0" end
⚫	function p.~~isIp~~(frame) return ~~_isIp~~( frame.args[ 1 ] ) or "" end

	function p.isIpOrRange(frame)		function p.isIpOrRange(frame)

Johnuniq: update from Module:IPAddress/sandbox with new isIpOrRange function per Module talk:IPAddress#isIpOrRange

2020-12-14T09:53:40Z

update from Module:IPAddress/sandbox with new isIpOrRange function per Module talk:IPAddress#isIpOrRange

← Previous revision		Revision as of 09:53, 14 December 2020
Line 11:		Line 11:

	function _isIpV6( s )		function _isIpV6( s )
	local dcolon, groups		local dcolon, groups
	if type( s ) ~= "string"		if type( s ) ~= "string"
	or s:len() == 0		or s:len() == 0
	or s:find( "[^:%x]" ) -- only colon and hex digits are legal chars		or s:find( "[^:%x]" ) -- only colon and hex digits are legal chars
	or s:find( "^:[^:]" ) -- can begin or end with :: but not with single :		or s:find( "^:[^:]" ) -- can begin or end with :: but not with single :
	or s:find( "[^:]:$" )		or s:find( "[^:]:$" )
	or s:find( ":::" )		or s:find( ":::" )
	then		then
	return false		return false
	end		end
	s, dcolon = s:gsub( "::", ":" )		s, dcolon = s:gsub( "::", ":" )
	if dcolon > 1 then return false end -- at most one ::		if dcolon > 1 then return false end -- at most one ::
	s = s:gsub( "^:?", ":" ) -- prepend : if needed, upper		s = s:gsub( "^:?", ":" ) -- prepend : if needed, upper
	s, groups = s:gsub( ":%x%x?%x?%x?", "" ) -- remove valid groups, and count them		s, groups = s:gsub( ":%x%x?%x?%x?", "" ) -- remove valid groups, and count them
	return ( ( dcolon == 1 and groups < 8 ) or ( dcolon == 0 and groups == 8 ) )		return ( ( dcolon == 1 and groups < 8 ) or ( dcolon == 0 and groups == 8 ) )
	and ( s:len() == 0 or ( dcolon == 1 and s == ":" ) ) -- might be one dangling : if original ended with ::		and ( s:len() == 0 or ( dcolon == 1 and s == ":" ) ) -- might be one dangling : if original ended with ::
	end		end

	function _isIpV4( s )		function _isIpV4( s )
	local function legal( n ) return ( tonumber( n ) or 256 ) < 256 and not n:match("^0%d") end-- in lua 0 is true!		local function legal( n ) return ( tonumber( n ) or 256 ) < 256 and not n:match("^0%d") end-- in lua 0 is true!


	if type( s ) ~= "string" then return false end		if type( s ) ~= "string" then return false end
	local p1, p2, p3, p4 = s:match( "^(%d+)%.(%d+)%.(%d+)%.(%d+)$" )		local p1, p2, p3, p4 = s:match( "^(%d+)%.(%d+)%.(%d+)%.(%d+)$" )
	return legal( p1 ) and legal( p2 ) and legal( p3 ) and legal( p4 )		return legal( p1 ) and legal( p2 ) and legal( p3 ) and legal( p4 )
	end		end

	function _isIp( s )		function _isIp( s )
	return _isIpV4( s ) and "4" or _isIpV6( s ) and "6"		return _isIpV4( s ) and "4" or _isIpV6( s ) and "6"
	end		end

Line 46:		Line 46:
	function p.isIpV4(frame) return _isIpV4( frame.args[ 1 ] ) and "1" or "0" end		function p.isIpV4(frame) return _isIpV4( frame.args[ 1 ] ) and "1" or "0" end
	function p.isIp(frame) return _isIp( frame.args[ 1 ] ) or "" end		function p.isIp(frame) return _isIp( frame.args[ 1 ] ) or "" end

			function p.isIpOrRange(frame)
			-- {{#invoke:IPAddress\|isIpOrRange\|x}} → 'ip' (IPv4/IPv6) or 'range' (CIDR IPv4/IPv6) or '' (invalid)
			local modip = require('Module:IP')
			local s = frame.args[1]
			local success, ip = pcall(modip.IPAddress.new, s)
			if success then
			return 'ip'
			end
			success, ip = pcall(modip.Subnet.new, s)
			if success then
			return 'range'
			end
			return ''
			end

	return p		return p

Xaosflux: Changed protection level for "Module:IPAddress": integrating to local interface via MediaWiki:Newarticletext ([Edit=Require administrator access] (indefinite) [Move=Require administrator access] (indefinite))

2019-12-31T19:05:04Z

Changed protection level for "Module:IPAddress": integrating to local interface via MediaWiki:Newarticletext ([Edit=Require administrator access] (indefinite) [Move=Require administrator access] (indefinite))

← Previous revision	Revision as of 19:05, 31 December 2019
(No difference)

MusikAnimal: Protected "Module:IPAddress": High-risk module ([Edit=Require template editor access] (indefinite))

2017-10-10T17:19:53Z

Protected "Module:IPAddress": High-risk module ([Edit=Require template editor access] (indefinite))

← Previous revision	Revision as of 17:19, 10 October 2017
(No difference)

Wim b: Undid revision 562528841 by Wim b (talk) no changes... :?

2013-07-02T11:31:52Z

Undid revision 562528841 by Wim b (talk) no changes... :?

← Previous revision		Revision as of 11:31, 2 July 2013
Line 8:		Line 8:

	Unit tests at Module:IPAddress/tests		Unit tests at Module:IPAddress/tests
	--]=]		]=]

	function _isIpV6( s )		function _isIpV6( s )

Wim b: fix comment tag

2013-07-02T11:30:21Z

fix comment tag

← Previous revision		Revision as of 11:30, 2 July 2013
Line 8:		Line 8:

	Unit tests at Module:IPAddress/tests		Unit tests at Module:IPAddress/tests
	]=]		--]=]

	function _isIpV6( s )		function _isIpV6( s )

קיפודנחש: disallow leading zero in ipV4, except when it's _just_ 0.

2013-03-08T16:28:41Z

disallow leading zero in ipV4, except when it's _just_ 0.

← Previous revision		Revision as of 16:28, 8 March 2013
Line 30:		Line 30:

	function _isIpV4( s )		function _isIpV4( s )
	local function legal( n ) return ( tonumber( n ) or 256 ) < 256 end-- in lua 0 is true!		local function legal( n ) return ( tonumber( n ) or 256 ) < 256 and not n:match("^0%d") end-- in lua 0 is true!

	if type( s ) ~= "string" then return false end		if type( s ) ~= "string" then return false end