Module:IP - Revision history

WOSlinker: use require('strict') instead of require('Module:No globals')

2022-10-22T09:07:04Z

use require('strict') instead of require('Module:No globals')

← Previous revision		Revision as of 09:07, 22 October 2022
Line 3:		Line 3:

	-- Load modules		-- Load modules
	require('~~Module:No globals~~')		require('strict')
	local bit32 = require('bit32')		local bit32 = require('bit32')
	local libraryUtil = require('libraryUtil')		local libraryUtil = require('libraryUtil')

Mr. Stradivarius: Protected "Module:IP": High-risk Lua module: used in the MediaWiki interface, e.g. MediaWiki:Blockiptext via Template:Sensitive IP addresses ([Edit=Require administrator access] (indefinite) [Move=Require administ...

2016-11-23T09:26:37Z

Protected "Module:IP": High-risk Lua module: used in the MediaWiki interface, e.g. MediaWiki:Blockiptext via Template:Sensitive IP addresses ([Edit=Require administrator access] (indefinite) [Move=Require administ...

← Previous revision	Revision as of 09:26, 23 November 2016
(No difference)

Mr. Stradivarius: we don't need to set a metatable in IPCollection.new if it will never be used as a standalone class

2016-11-22T14:20:41Z

we don't need to set a metatable in IPCollection.new if it will never be used as a standalone class

← Previous revision		Revision as of 14:20, 22 November 2016
Line 799:		Line 799:
	omitted = Collection.new(), -- not-quite valid strings		omitted = Collection.new(), -- not-quite valid strings
	}		}
	return ~~setmetatable(~~obj~~, IPCollection)~~		return obj
	end		end

Mr. Stradivarius: check type in addFromString

2016-11-22T14:15:52Z

check type in addFromString

← Previous revision		Revision as of 14:15, 22 November 2016
Line 789:		Line 789:

	function IPCollection.new(version)		function IPCollection.new(version)
			assert(
⚫	~~assert(version == V4 or version == V6,~~ 'IPCollection.new called with an invalid version')
			version == V4 or version == V6,
		⚫	'IPCollection.new called with an invalid version'
			)
	local obj = {		local obj = {
	version = version, -- V4 or V6		version = version, -- V4 or V6
Line 946:		Line 949:
	function IPv4Collection:addFromString(text)		function IPv4Collection:addFromString(text)
	-- Extract any IPv4 addresses or CIDR subnets from given text.		-- Extract any IPv4 addresses or CIDR subnets from given text.
			checkType('addFromString', 1, text, 'string')
	text = text:gsub('[:!"#&\'()+,%-;<=>?[%]_{\|}]', ' ')		text = text:gsub('[:!"#&\'()+,%-;<=>?[%]_{\|}]', ' ')
	for hit in text:gmatch('%S+') do		for hit in text:gmatch('%S+') do
Line 994:		Line 998:
	-- Therefore, if an address at the start of a line is valid, use it;		-- Therefore, if an address at the start of a line is valid, use it;
	-- otherwise strip any leading colons and try again.		-- otherwise strip any leading colons and try again.
			checkType('addFromString', 1, text, 'string')
	for line in string.gmatch(text .. '\n', '[\t ](.-)[\t\r ]\n') do		for line in string.gmatch(text .. '\n', '[\t ](.-)[\t\r ]\n') do
	line = line:gsub('[!"#&\'()+,%-;<=>?[%]_{\|}]', ' ')		line = line:gsub('[!"#&\'()+,%-;<=>?[%]_{\|}]', ' ')

Mr. Stradivarius: enable chaining on collection adding methods

2016-11-22T13:11:58Z

enable chaining on collection adding methods

← Previous revision		Revision as of 13:11, 22 November 2016
Line 845:		Line 845:
	self:_assertVersion(ip:getVersion(), 'addIP called with incorrect IP version')		self:_assertVersion(ip:getVersion(), 'addIP called with incorrect IP version')
	self.addresses:add(ip)		self.addresses:add(ip)
			return self
	end		end

Line 858:		Line 859:
	self:_assertVersion(subnet:getVersion(), 'addSubnet called with incorrect subnet version')		self:_assertVersion(subnet:getVersion(), 'addSubnet called with incorrect subnet version')
	self.subnets:add(subnet)		self.subnets:add(subnet)
			return self
	end		end

Line 953:		Line 955:
	end		end
	end		end
			return self
	end		end

Line 1,003:		Line 1,006:
	end		end
	end		end
			return self
	end		end
	end		end

Mr. Stradivarius: we need to use setmetatable in IPv4Collection.new and IPv6Collection.new

2016-11-22T07:14:10Z

we need to use setmetatable in IPv4Collection.new and IPv6Collection.new

← Previous revision		Revision as of 07:14, 22 November 2016
Line 939:		Line 939:

	function IPv4Collection.new()		function IPv4Collection.new()
	return IPCollection.new(V4)		return setmetatable(IPCollection.new(V4), IPv4Collection)
	end		end

Line 980:		Line 980:

	function IPv6Collection.new()		function IPv6Collection.new()
	return IPCollection.new(V6)		return setmetatable(IPCollection.new(V6), IPv6Collection)
	end		end

Mr. Stradivarius: don't expose Range objects to clients through IPCollection:getRanges - just give them a plain old array

2016-10-24T04:29:06Z

don't expose Range objects to clients through IPCollection:getRanges - just give them a plain old array

← Previous revision		Revision as of 04:29, 24 October 2016
Line 58:		Line 58:
	function Collection:sort(comp)		function Collection:sort(comp)
	table.sort(self, comp)		table.sort(self, comp)
			end

			function Collection:deobjectify()
			-- Turns the collection into a plain array without any special properties
			-- or methods.
			self.n = nil
			setmetatable(self, nil)
	end		end

Line 892:		Line 899:
	end		end
	ranges:merge()		ranges:merge()
			ranges:deobjectify()
	return ranges		return ranges
	end		end

Mr. Stradivarius: move IPCollection:addFromStringIPv4 and IPCollection:addFromStringIPv6 into their respective child classes; this way we can be sure they are always called with the right IP version

2016-10-24T03:37:11Z

move IPCollection:addFromStringIPv4 and IPCollection:addFromStringIPv6 into their respective child classes; this way we can be sure they are always called with the right IP version

@@ Line 851: / Line 851: @@
 	self:_assertVersion(subnet:getVersion(), 'addSubnet called with incorrect subnet version')
 	self.subnets:add(subnet)
 end
@@ Line 972: / Line 935: @@
 function IPv4Collection:addFromString(text)
 end
@@ Line 1,004: / Line 976: @@
 	function IPv6Collection:addFromString(text)
 	end
 end

Mr. Stradivarius: make IPCollection:assertVersion quasi-private, as it doesn't make that much sense to call it from outside the library

2016-10-21T07:04:07Z

make IPCollection:assertVersion quasi-private, as it doesn't make that much sense to call it from outside the library

← Previous revision		Revision as of 07:04, 21 October 2016
Line 821:		Line 821:
	end		end

	function IPCollection:~~assertVersion~~(version, msg)		function IPCollection:_assertVersion(version, msg)
	if self.version ~= version then		if self.version ~= version then
	error(msg, 3)		error(msg, 3)
Line 836:		Line 836:
	checkTypeMulti('addIP', 1, ip, {'string', 'table'})		checkTypeMulti('addIP', 1, ip, {'string', 'table'})
	end		end
	self:~~assertVersion~~(ip:getVersion(), 'addIP called with incorrect IP version')		self:_assertVersion(ip:getVersion(), 'addIP called with incorrect IP version')
	self.addresses:add(ip)		self.addresses:add(ip)
	end		end
Line 849:		Line 849:
	checkTypeMulti('addSubnet', 1, subnet, {'string', 'table'})		checkTypeMulti('addSubnet', 1, subnet, {'string', 'table'})
	end		end
	self:~~assertVersion~~(subnet:getVersion(), 'addSubnet called with incorrect subnet version')		self:_assertVersion(subnet:getVersion(), 'addSubnet called with incorrect subnet version')
	self.subnets:add(subnet)		self.subnets:add(subnet)
	end		end

Mr. Stradivarius: fix inheritance whoopsie

2016-08-09T13:04:41Z

fix inheritance whoopsie

← Previous revision		Revision as of 13:04, 9 August 2016
Line 964:		Line 964:
	--------------------------------------------------------------------------------		--------------------------------------------------------------------------------

	local IPv4Collection = ~~IPCollection.new~~(V4)		local IPv4Collection = setmetatable({}, IPCollection)
	IPv4Collection.__index = IPv4Collection		IPv4Collection.__index = IPv4Collection

	function IPv4Collection.new()		function IPv4Collection.new()
	return ~~setmetatable~~(~~{}, IPv4Collection~~)		return IPCollection.new(V4)
	end		end

Line 980:		Line 980:
	--------------------------------------------------------------------------------		--------------------------------------------------------------------------------

	local IPv6Collection = ~~IPCollection.new~~(V6)		local IPv6Collection = setmetatable({}, IPCollection)
	IPv6Collection.__index = IPv6Collection		IPv6Collection.__index = IPv6Collection

Line 1,000:		Line 1,000:

	function IPv6Collection.new()		function IPv6Collection.new()
	return ~~setmetatable~~(~~{}, IPv6Collection~~)		return IPCollection.new(V6)
	end		end