diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c3f8045..a877e8d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@
* ADDED: Google Cloud Storage backend support (#795)
* ADDED: Oracle database support (#868)
* CHANGED: Language selection cookie only transmitted over HTTPS (#472)
- * CHANGED: Upgrading libraries to: random_compat 2.0.20
+ * CHANGED: Upgrading libraries to: base-x 4.0.0, DOMpurify 2.3.6, ip-lib 1.18.0, jQuery 3.6.0, random_compat 2.0.21 & Showdown 2.0.0
* CHANGED: Removed automatic `.ini` configuration file migration (#808)
* CHANGED: Removed configurable `dir` for `traffic` & `purge` limiters (#419)
* CHANGED: Server salt, traffic and purge limiter now stored in the storage backend (#419)
diff --git a/composer.json b/composer.json
index 7b09fc3c..0fd34559 100644
--- a/composer.json
+++ b/composer.json
@@ -25,12 +25,12 @@
},
"require" : {
"php" : "^5.6.0 || ^7.0 || ^8.0",
- "paragonie/random_compat" : "2.0.20",
+ "paragonie/random_compat" : "2.0.21",
"yzalis/identicon" : "2.0.0",
- "mlocati/ip-lib" : "1.14.0"
+ "mlocati/ip-lib" : "1.18.0"
},
"suggest" : {
- "google/cloud-storage" : "1.23.1"
+ "google/cloud-storage" : "1.26.1"
},
"require-dev" : {
"phpunit/phpunit" : "^4.6 || ^5.0"
@@ -43,4 +43,4 @@
"config" : {
"autoloader-suffix" : "DontChange"
}
-}
\ No newline at end of file
+}
diff --git a/composer.lock b/composer.lock
index 7a605204..a159dd80 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,20 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "217f0ba9bdac1014a332a8ba390be949",
+ "content-hash": "fa52d4988bfe17d4b27e3a4789a1ec49",
"packages": [
{
"name": "mlocati/ip-lib",
- "version": "1.14.0",
+ "version": "1.18.0",
"source": {
"type": "git",
"url": "https://github.com/mlocati/ip-lib.git",
- "reference": "882bc0e115970a536b13bcfa59f312783fce08c8"
+ "reference": "c77bd0b1f3e3956c7e9661e75cb1f54ed67d95d2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mlocati/ip-lib/zipball/882bc0e115970a536b13bcfa59f312783fce08c8",
- "reference": "882bc0e115970a536b13bcfa59f312783fce08c8",
+ "url": "https://api.github.com/repos/mlocati/ip-lib/zipball/c77bd0b1f3e3956c7e9661e75cb1f54ed67d95d2",
+ "reference": "c77bd0b1f3e3956c7e9661e75cb1f54ed67d95d2",
"shasum": ""
},
"require": {
@@ -25,8 +25,7 @@
},
"require-dev": {
"ext-pdo_sqlite": "*",
- "phpunit/dbunit": "^1.4 || ^2 || ^3 || ^4",
- "phpunit/phpunit": "^4.8 || ^5.7 || ^6.5"
+ "phpunit/phpunit": "^4.8 || ^5.7 || ^6.5 || ^7.5 || ^8.5 || ^9.5"
},
"type": "library",
"autoload": {
@@ -72,27 +71,27 @@
"type": "other"
}
],
- "time": "2020-12-31T11:30:02+00:00"
+ "time": "2022-01-13T18:05:33+00:00"
},
{
"name": "paragonie/random_compat",
- "version": "v2.0.20",
+ "version": "v2.0.21",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
- "reference": "0f1f60250fccffeaf5dda91eea1c018aed1adc2a"
+ "reference": "96c132c7f2f7bc3230723b66e89f8f150b29d5ae"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/random_compat/zipball/0f1f60250fccffeaf5dda91eea1c018aed1adc2a",
- "reference": "0f1f60250fccffeaf5dda91eea1c018aed1adc2a",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/96c132c7f2f7bc3230723b66e89f8f150b29d5ae",
+ "reference": "96c132c7f2f7bc3230723b66e89f8f150b29d5ae",
"shasum": ""
},
"require": {
"php": ">=5.2.0"
},
"require-dev": {
- "phpunit/phpunit": "4.*|5.*"
+ "phpunit/phpunit": "*"
},
"suggest": {
"ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
@@ -121,7 +120,7 @@
"pseudorandom",
"random"
],
- "time": "2021-04-17T09:33:01+00:00"
+ "time": "2022-02-16T17:07:03+00:00"
},
{
"name": "yzalis/identicon",
@@ -270,12 +269,12 @@
},
"type": "library",
"autoload": {
- "psr-4": {
- "DeepCopy\\": "src/DeepCopy/"
- },
"files": [
"src/DeepCopy/deep_copy.php"
- ]
+ ],
+ "psr-4": {
+ "DeepCopy\\": "src/DeepCopy/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -348,16 +347,16 @@
},
{
"name": "phpdocumentor/reflection-docblock",
- "version": "5.2.2",
+ "version": "5.3.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
- "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556"
+ "reference": "622548b623e81ca6d78b721c5e029f4ce664f170"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556",
- "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556",
+ "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170",
+ "reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
"shasum": ""
},
"require": {
@@ -368,7 +367,8 @@
"webmozart/assert": "^1.9.1"
},
"require-dev": {
- "mockery/mockery": "~1.3.2"
+ "mockery/mockery": "~1.3.2",
+ "psalm/phar": "^4.8"
},
"type": "library",
"extra": {
@@ -396,20 +396,20 @@
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
- "time": "2020-09-03T19:13:55+00:00"
+ "time": "2021-10-19T17:43:47+00:00"
},
{
"name": "phpdocumentor/type-resolver",
- "version": "1.4.0",
+ "version": "1.6.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
- "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0"
+ "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
- "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
+ "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706",
+ "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706",
"shasum": ""
},
"require": {
@@ -417,7 +417,8 @@
"phpdocumentor/reflection-common": "^2.0"
},
"require-dev": {
- "ext-tokenizer": "*"
+ "ext-tokenizer": "*",
+ "psalm/phar": "^4.8"
},
"type": "library",
"extra": {
@@ -441,7 +442,7 @@
}
],
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
- "time": "2020-09-17T18:55:26+00:00"
+ "time": "2022-01-04T19:58:01+00:00"
},
{
"name": "phpspec/prophecy",
@@ -1419,21 +1420,24 @@
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.23.0",
+ "version": "v1.24.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce"
+ "reference": "30885182c981ab175d4d034db0f6f469898070ab"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce",
- "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
+ "reference": "30885182c981ab175d4d034db0f6f469898070ab",
"shasum": ""
},
"require": {
"php": ">=7.1"
},
+ "provide": {
+ "ext-ctype": "*"
+ },
"suggest": {
"ext-ctype": "For best performance"
},
@@ -1491,20 +1495,20 @@
"type": "tidelift"
}
],
- "time": "2021-02-19T12:13:01+00:00"
+ "time": "2021-10-20T20:35:02+00:00"
},
{
"name": "symfony/yaml",
- "version": "v4.4.24",
+ "version": "v4.4.37",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "8b6d1b97521e2f125039b3fcb4747584c6dfa0ef"
+ "reference": "d7f637cc0f0cc14beb0984f2bb50da560b271311"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/8b6d1b97521e2f125039b3fcb4747584c6dfa0ef",
- "reference": "8b6d1b97521e2f125039b3fcb4747584c6dfa0ef",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/d7f637cc0f0cc14beb0984f2bb50da560b271311",
+ "reference": "d7f637cc0f0cc14beb0984f2bb50da560b271311",
"shasum": ""
},
"require": {
@@ -1559,7 +1563,7 @@
"type": "tidelift"
}
],
- "time": "2021-05-16T09:52:47+00:00"
+ "time": "2022-01-24T20:11:01+00:00"
},
{
"name": "webmozart/assert",
diff --git a/js/base-x-3.0.7.js b/js/base-x-4.0.0.js
similarity index 87%
rename from js/base-x-3.0.7.js
rename to js/base-x-4.0.0.js
index 7608d2e2..0a839786 100644
--- a/js/base-x-3.0.7.js
+++ b/js/base-x-4.0.0.js
@@ -1,17 +1,16 @@
'use strict';
// base-x encoding / decoding
-// based on https://github.com/cryptocoinjs/base-x 3.0.7
-// modification: removed Buffer dependency and node.modules entry
// Copyright (c) 2018 base-x contributors
// Copyright (c) 2014-2018 The Bitcoin Core developers (base58.cpp)
// Distributed under the MIT software license, see the accompanying
// file LICENSE or http://www.opensource.org/licenses/mit-license.php.
-
(function(){
this.baseX = function base (ALPHABET) {
if (ALPHABET.length >= 255) { throw new TypeError('Alphabet too long') }
var BASE_MAP = new Uint8Array(256)
- BASE_MAP.fill(255)
+ for (var j = 0; j < BASE_MAP.length; j++) {
+ BASE_MAP[j] = 255
+ }
for (var i = 0; i < ALPHABET.length; i++) {
var x = ALPHABET.charAt(i)
var xc = x.charCodeAt(0)
@@ -23,6 +22,13 @@ this.baseX = function base (ALPHABET) {
var FACTOR = Math.log(BASE) / Math.log(256) // log(BASE) / log(256), rounded up
var iFACTOR = Math.log(256) / Math.log(BASE) // log(256) / log(BASE), rounded up
function encode (source) {
+ if (source instanceof Uint8Array) {
+ } else if (ArrayBuffer.isView(source)) {
+ source = new Uint8Array(source.buffer, source.byteOffset, source.byteLength)
+ } else if (Array.isArray(source)) {
+ source = Uint8Array.from(source)
+ }
+ if (!(source instanceof Uint8Array)) { throw new TypeError('Expected Uint8Array') }
if (source.length === 0) { return '' }
// Skip & count leading zeroes.
var zeroes = 0
@@ -62,10 +68,8 @@ this.baseX = function base (ALPHABET) {
}
function decodeUnsafe (source) {
if (typeof source !== 'string') { throw new TypeError('Expected String') }
- if (source.length === 0) { return '' }
+ if (source.length === 0) { return new Uint8Array() }
var psz = 0
- // Skip leading spaces.
- if (source[psz] === ' ') { return }
// Skip and count leading '1's.
var zeroes = 0
var length = 0
@@ -92,14 +96,12 @@ this.baseX = function base (ALPHABET) {
length = i
psz++
}
- // Skip trailing spaces.
- if (source[psz] === ' ') { return }
// Skip leading zeroes in b256.
var it4 = size - length
while (it4 !== size && b256[it4] === 0) {
it4++
}
- var vch = []
+ var vch = new Uint8Array(zeroes + (size - it4))
var j = zeroes
while (it4 !== size) {
vch[j++] = b256[it4++]
diff --git a/js/common.js b/js/common.js
index 4acbbfca..7806948c 100644
--- a/js/common.js
+++ b/js/common.js
@@ -16,9 +16,9 @@ global.zlib = require('./zlib-1.2.11').zlib;
require('./prettify');
global.prettyPrint = window.PR.prettyPrint;
global.prettyPrintOne = window.PR.prettyPrintOne;
-global.showdown = require('./showdown-1.9.1');
-global.DOMPurify = require('./purify-2.2.7');
-global.baseX = require('./base-x-3.0.7').baseX;
+global.showdown = require('./showdown-2.0.0');
+global.DOMPurify = require('./purify-2.3.6');
+global.baseX = require('./base-x-4.0.0').baseX;
global.Legacy = require('./legacy').Legacy;
require('./bootstrap-3.3.7');
require('./privatebin');
diff --git a/js/purify-2.2.7.js b/js/purify-2.2.7.js
deleted file mode 100644
index e9e4badf..00000000
--- a/js/purify-2.2.7.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! @license DOMPurify | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/2.2.2/LICENSE */
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e=e||self).DOMPurify=t()}(this,(function(){"use strict";var e=Object.hasOwnProperty,t=Object.setPrototypeOf,n=Object.isFrozen,r=Object.getPrototypeOf,o=Object.getOwnPropertyDescriptor,i=Object.freeze,a=Object.seal,l=Object.create,c="undefined"!=typeof Reflect&&Reflect,s=c.apply,u=c.construct;s||(s=function(e,t,n){return e.apply(t,n)}),i||(i=function(e){return e}),a||(a=function(e){return e}),u||(u=function(e,t){return new(Function.prototype.bind.apply(e,[null].concat(function(e){if(Array.isArray(e)){for(var t=0,n=Array(e.length);t "),l+="
(GFM Style)",type:"boolean"},requireSpaceBeforeHeadingText:{defaultValue:!1,description:"Makes adding a space between `#` and the header text mandatory (GFM Style)",type:"boolean"},ghMentions:{defaultValue:!1,description:"Enables github @mentions",type:"boolean"},ghMentionsLink:{defaultValue:"https://github.com/{u}",description:"Changes the link generated by @mentions. Only applies if ghMentions option is enabled.",type:"string"},encodeEmails:{defaultValue:!0,description:"Encode e-mail addresses through the use of Character Entities, transforming ASCII e-mail addresses into its equivalent decimal entities",type:"boolean"},openLinksInNewWindow:{defaultValue:!1,description:"Open all links in new windows",type:"boolean"},backslashEscapesHTMLTags:{defaultValue:!1,description:"Support for HTML Tag escaping. ex: [^\r]+?<\/pre>)/gm,function(e,r){var t=r;return t=t.replace(/^ /gm,"¨0"),t=t.replace(/¨0/g,"")}),a.subParser("hashBlock")("
","gim"),e=t.converter._dispatch("hashPreCodeTags.after",e,r,t)}),a.subParser("headers",function(e,r,t){"use strict";function n(e){var n,s;if(r.customizedHeaderId){var o=e.match(/\{([^{]+?)}\s*$/);o&&o[1]&&(e=o[1])}return n=e,s=a.helper.isString(r.prefixHeaderId)?r.prefixHeaderId:!0===r.prefixHeaderId?"section-":"",r.rawPrefixHeaderId||(n=s+n),n=r.ghCompatibleHeaderId?n.replace(/ /g,"-").replace(/&/g,"").replace(/¨T/g,"").replace(/¨D/g,"").replace(/[&+$,\/:;=?@"#{}|^¨~\[\]`\\*)(%.!'<>]/g,"").toLowerCase():r.rawHeaderId?n.replace(/ /g,"-").replace(/&/g,"&").replace(/¨T/g,"¨").replace(/¨D/g,"$").replace(/["']/g,"-").toLowerCase():n.replace(/[^\w]/g,"").toLowerCase(),r.rawPrefixHeaderId&&(n=s+n),t.hashLinkCounts[n]?n=n+"-"+t.hashLinkCounts[n]++:t.hashLinkCounts[n]=1,n}e=t.converter._dispatch("headers.before",e,r,t);var s=isNaN(parseInt(r.headerLevelStart))?1:parseInt(r.headerLevelStart),o=r.smoothLivePreview?/^(.+)[ \t]*\n={2,}[ \t]*\n+/gm:/^(.+)[ \t]*\n=+[ \t]*\n+/gm,i=r.smoothLivePreview?/^(.+)[ \t]*\n-{2,}[ \t]*\n+/gm:/^(.+)[ \t]*\n-+[ \t]*\n+/gm;e=(e=e.replace(o,function(e,o){var i=a.subParser("spanGamut")(o,r,t),l=r.noHeaderId?"":' id="'+n(o)+'"',c="\n"+e+"\n
",r,t)}),e=t.converter._dispatch("blockQuotes.after",e,r,t)}),a.subParser("codeBlocks",function(e,r,t){"use strict";e=t.converter._dispatch("codeBlocks.before",e,r,t);return e=(e+="¨0").replace(/(?:\n\n|^)((?:(?:[ ]{4}|\t).*\n+)+)(\n*[ ]{0,3}[^ \t\n]|(?=¨0))/g,function(e,n,s){var o=n,i=s,l="\n";return o=a.subParser("outdent")(o,r,t),o=a.subParser("encodeCode")(o,r,t),o=a.subParser("detab")(o,r,t),o=o.replace(/^\n+/g,""),o=o.replace(/\n+$/g,""),r.omitExtraWLInCodeBlocks&&(l=""),o="
",a.subParser("hashBlock")(o,r,t)+i}),e=e.replace(/¨0/,""),e=t.converter._dispatch("codeBlocks.after",e,r,t)}),a.subParser("codeSpans",function(e,r,t){"use strict";return void 0===(e=t.converter._dispatch("codeSpans.before",e,r,t))&&(e=""),e=e.replace(/(^|[^\\])(`+)([^\r]*?[^`])\2(?!`)/gm,function(e,n,s,o){var i=o;return i=i.replace(/^([ \t]*)/g,""),i=i.replace(/[ \t]*$/g,""),i=a.subParser("encodeCode")(i,r,t),i=n+""+o+l+"
"+i+"
",i=a.subParser("hashHTMLSpans")(i,r,t)}),e=t.converter._dispatch("codeSpans.after",e,r,t)}),a.subParser("completeHTMLDocument",function(e,r,t){"use strict";if(!r.completeHTMLDocument)return e;e=t.converter._dispatch("completeHTMLDocument.before",e,r,t);var a="html",n="\n",s="",o='\n',i="",l="";void 0!==t.metadata.parsed.doctype&&(n="\n","html"!==(a=t.metadata.parsed.doctype.toString().toLowerCase())&&"html5"!==a||(o=''));for(var c in t.metadata.parsed)if(t.metadata.parsed.hasOwnProperty(c))switch(c.toLowerCase()){case"doctype":break;case"title":s="
",o=a.subParser("hashBlock")(o,r,t),"\n\n¨G"+(t.ghCodeBlocks.push({text:e,codeblock:o})-1)+"G\n\n"}),e=e.replace(/¨0/,""),t.converter._dispatch("githubCodeBlocks.after",e,r,t)):e}),a.subParser("hashBlock",function(e,r,t){"use strict";return e=t.converter._dispatch("hashBlock.before",e,r,t),e=e.replace(/(^\n+|\n+$)/g,""),e="\n\n¨K"+(t.gHtmlBlocks.push(e)-1)+"K\n\n",e=t.converter._dispatch("hashBlock.after",e,r,t)}),a.subParser("hashCodeTags",function(e,r,t){"use strict";e=t.converter._dispatch("hashCodeTags.before",e,r,t);return e=a.helper.replaceRecursiveRegExp(e,function(e,n,s,o){var i=s+a.subParser("encodeCode")(n,r,t)+o;return"¨C"+(t.gHtmlSpans.push(i)-1)+"C"},""+o+i+"
]*>","
","gim"),e=t.converter._dispatch("hashCodeTags.after",e,r,t)}),a.subParser("hashElement",function(e,r,t){"use strict";return function(e,r){var a=r;return a=a.replace(/\n\n/g,"\n"),a=a.replace(/^\n/,""),a=a.replace(/\n+$/g,""),a="\n\n¨K"+(t.gHtmlBlocks.push(a)-1)+"K\n\n"}}),a.subParser("hashHTMLBlocks",function(e,r,t){"use strict";e=t.converter._dispatch("hashHTMLBlocks.before",e,r,t);var n=["pre","div","h1","h2","h3","h4","h5","h6","blockquote","table","dl","ol","ul","script","noscript","form","fieldset","iframe","math","style","section","header","footer","nav","article","aside","address","audio","canvas","figure","hgroup","output","video","p"],s=function(e,r,a,n){var s=e;return-1!==a.search(/\bmarkdown\b/)&&(s=a+t.converter.makeHtml(r)+n),"\n\n¨K"+(t.gHtmlBlocks.push(s)-1)+"K\n\n"};r.backslashEscapesHTMLTags&&(e=e.replace(/\\<(\/?[^>]+?)>/g,function(e,r){return"<"+r+">"}));for(var o=0;o]*>","^ {0,3}
\\s*
",r,t);return e=e.replace(/^ {0,2}( ?-){3,}[ \t]*$/gm,n),e=e.replace(/^ {0,2}( ?\*){3,}[ \t]*$/gm,n),e=e.replace(/^ {0,2}( ?_){3,}[ \t]*$/gm,n),e=t.converter._dispatch("horizontalRule.after",e,r,t)}),a.subParser("images",function(e,r,t){"use strict";function n(e,r,n,s,o,i,l,c){var u=t.gUrls,d=t.gTitles,p=t.gDimensions;if(n=n.toLowerCase(),c||(c=""),e.search(/\(\s*>? ?(['"].*['"])?\)$/m)>-1)s="";else if(""===s||null===s){if(""!==n&&null!==n||(n=r.toLowerCase().replace(/ ?\n/g," ")),s="#"+n,a.helper.isUndefined(u[n]))return e;s=u[n],a.helper.isUndefined(d[n])||(c=d[n]),a.helper.isUndefined(p[n])||(o=p[n].width,i=p[n].height)}r=r.replace(/"/g,""").replace(a.helper.regexes.asteriskDashAndColon,a.helper.escapeCharactersCallback);var h='"}return e=(e=t.converter._dispatch("images.before",e,r,t)).replace(/!\[([^\]]*?)] ?(?:\n *)?\[([\s\S]*?)]()()()()()/g,n),e=e.replace(/!\[([^\]]*?)][ \t]*()\([ \t]?(data:.+?\/.+?;base64,[A-Za-z0-9+/=\n]+?)>?(?: =([*\d]+[A-Za-z%]{0,4})x([*\d]+[A-Za-z%]{0,4}))?[ \t]*(?:(["'])([^"]*?)\6)?[ \t]?\)/g,function(e,r,t,a,s,o,i,l){return a=a.replace(/\s/g,""),n(e,r,t,a,s,o,0,l)}),e=e.replace(/!\[([^\]]*?)][ \t]*()\([ \t]?<([^>]*)>(?: =([*\d]+[A-Za-z%]{0,4})x([*\d]+[A-Za-z%]{0,4}))?[ \t]*(?:(?:(["'])([^"]*?)\6))?[ \t]?\)/g,n),e=e.replace(/!\[([^\]]*?)][ \t]*()\([ \t]?([\S]+?(?:\([\S]*?\)[\S]*?)?)>?(?: =([*\d]+[A-Za-z%]{0,4})x([*\d]+[A-Za-z%]{0,4}))?[ \t]*(?:(["'])([^"]*?)\6)?[ \t]?\)/g,n),e=e.replace(/!\[([^\[\]]+)]()()()()()/g,n),e=t.converter._dispatch("images.after",e,r,t)}),a.subParser("italicsAndBold",function(e,r,t){"use strict";function a(e,r,t){return r+e+t}return e=t.converter._dispatch("italicsAndBold.before",e,r,t),e=r.literalMidWordUnderscores?(e=(e=e.replace(/\b___(\S[\s\S]*?)___\b/g,function(e,r){return a(r,"","")})).replace(/\b__(\S[\s\S]*?)__\b/g,function(e,r){return a(r,"","")})).replace(/\b_(\S[\s\S]*?)_\b/g,function(e,r){return a(r,"","")}):(e=(e=e.replace(/___(\S[\s\S]*?)___/g,function(e,r){return/\S$/.test(r)?a(r,"",""):e})).replace(/__(\S[\s\S]*?)__/g,function(e,r){return/\S$/.test(r)?a(r,"",""):e})).replace(/_([^\s_][\s\S]*?)_/g,function(e,r){return/\S$/.test(r)?a(r,"",""):e}),e=r.literalMidWordAsterisks?(e=(e=e.replace(/([^*]|^)\B\*\*\*(\S[\s\S]*?)\*\*\*\B(?!\*)/g,function(e,r,t){return a(t,r+"","")})).replace(/([^*]|^)\B\*\*(\S[\s\S]*?)\*\*\B(?!\*)/g,function(e,r,t){return a(t,r+"","")})).replace(/([^*]|^)\B\*(\S[\s\S]*?)\*\B(?!\*)/g,function(e,r,t){return a(t,r+"","")}):(e=(e=e.replace(/\*\*\*(\S[\s\S]*?)\*\*\*/g,function(e,r){return/\S$/.test(r)?a(r,"",""):e})).replace(/\*\*(\S[\s\S]*?)\*\*/g,function(e,r){return/\S$/.test(r)?a(r,"",""):e})).replace(/\*([^\s*][\s\S]*?)\*/g,function(e,r){return/\S$/.test(r)?a(r,"",""):e}),e=t.converter._dispatch("italicsAndBold.after",e,r,t)}),a.subParser("lists",function(e,r,t){"use strict";function n(e,n){t.gListLevel++,e=e.replace(/\n{2,}$/,"\n");var s=/(\n)?(^ {0,3})([*+-]|\d+[.])[ \t]+((\[(x|X| )?])?[ \t]*[^\r]+?(\n{1,2}))(?=\n*(¨0| {0,3}([*+-]|\d+[.])[ \t]+))/gm,o=/\n[ \t]*\n(?!¨0)/.test(e+="¨0");return r.disableForced4SpacesIndentedSublists&&(s=/(\n)?(^ {0,3})([*+-]|\d+[.])[ \t]+((\[(x|X| )?])?[ \t]*[^\r]+?(\n{1,2}))(?=\n*(¨0|\2([*+-]|\d+[.])[ \t]+))/gm),e=e.replace(s,function(e,n,s,i,l,c,u){u=u&&""!==u.trim();var d=a.subParser("outdent")(l,r,t),p="";return c&&r.tasklists&&(p=' class="task-list-item" style="list-style-type: none;"',d=d.replace(/^[ \t]*\[(x|X| )?]/m,function(){var e='"})),d=d.replace(/^([-*+]|\d\.)[ \t]+[\S\n ]*/g,function(e){return"¨A"+e}),n||d.search(/\n{2,}/)>-1?(d=a.subParser("githubCodeBlocks")(d,r,t),d=a.subParser("blockGamut")(d,r,t)):(d=(d=a.subParser("lists")(d,r,t)).replace(/\n$/,""),d=(d=a.subParser("hashHTMLBlocks")(d,r,t)).replace(/\n\n+/g,"\n\n"),d=o?a.subParser("paragraphs")(d,r,t):a.subParser("spanGamut")(d,r,t)),d=d.replace("¨A",""),d="]*>/.test(u)&&(d=!0)}s[i]=u}return e=s.join("\n"),e=e.replace(/^\n+/g,""),e=e.replace(/\n+$/g,""),t.converter._dispatch("paragraphs.after",e,r,t)}),a.subParser("runExtension",function(e,r,t,a){"use strict";if(e.filter)r=e.filter(r,a.converter,t);else if(e.regex){var n=e.regex;n instanceof RegExp||(n=new RegExp(n,"g")),r=r.replace(n,e.replace)}return r}),a.subParser("spanGamut",function(e,r,t){"use strict";return e=t.converter._dispatch("spanGamut.before",e,r,t),e=a.subParser("codeSpans")(e,r,t),e=a.subParser("escapeSpecialCharsWithinTagAttributes")(e,r,t),e=a.subParser("encodeBackslashEscapes")(e,r,t),e=a.subParser("images")(e,r,t),e=a.subParser("anchors")(e,r,t),e=a.subParser("autoLinks")(e,r,t),e=a.subParser("simplifiedAutoLinks")(e,r,t),e=a.subParser("emoji")(e,r,t),e=a.subParser("underline")(e,r,t),e=a.subParser("italicsAndBold")(e,r,t),e=a.subParser("strikethrough")(e,r,t),e=a.subParser("ellipsis")(e,r,t),e=a.subParser("hashHTMLSpans")(e,r,t),e=a.subParser("encodeAmpsAndAngles")(e,r,t),r.simpleLineBreaks?/\n\n¨K/.test(e)||(e=e.replace(/\n+/g,"
\n")):e=e.replace(/ +\n/g,"
\n"),e=t.converter._dispatch("spanGamut.after",e,r,t)}),a.subParser("strikethrough",function(e,r,t){"use strict";return r.strikethrough&&(e=(e=t.converter._dispatch("strikethrough.before",e,r,t)).replace(/(?:~){2}([\s\S]+?)(?:~){2}/g,function(e,n){return function(e){return r.simplifiedAutoLink&&(e=a.subParser("simplifiedAutoLinks")(e,r,t)),""+e+""}(n)}),e=t.converter._dispatch("strikethrough.after",e,r,t)),e}),a.subParser("stripLinkDefinitions",function(e,r,t){"use strict";var n=function(e,n,s,o,i,l,c){return n=n.toLowerCase(),s.match(/^data:.+?\/.+?;base64,/)?t.gUrls[n]=s.replace(/\s/g,""):t.gUrls[n]=a.subParser("encodeAmpsAndAngles")(s,r,t),l?l+c:(c&&(t.gTitles[n]=c.replace(/"|'/g,""")),r.parseImgDimensions&&o&&i&&(t.gDimensions[n]={width:o,height:i}),"")};return e=(e+="¨0").replace(/^ {0,3}\[(.+)]:[ \t]*\n?[ \t]*(data:.+?\/.+?;base64,[A-Za-z0-9+/=\n]+?)>?(?: =([*\d]+[A-Za-z%]{0,4})x([*\d]+[A-Za-z%]{0,4}))?[ \t]*\n?[ \t]*(?:(\n*)["|'(](.+?)["|')][ \t]*)?(?:\n\n|(?=¨0)|(?=\n\[))/gm,n),e=e.replace(/^ {0,3}\[(.+)]:[ \t]*\n?[ \t]*([^>\s]+)>?(?: =([*\d]+[A-Za-z%]{0,4})x([*\d]+[A-Za-z%]{0,4}))?[ \t]*\n?[ \t]*(?:(\n*)["|'(](.+?)["|')][ \t]*)?(?:\n+|(?=¨0))/gm,n),e=e.replace(/¨0/,"")}),a.subParser("tables",function(e,r,t){"use strict";function n(e){return/^:[ \t]*--*$/.test(e)?' style="text-align:left;"':/^--*[ \t]*:[ \t]*$/.test(e)?' style="text-align:right;"':/^:[ \t]*--*[ \t]*:$/.test(e)?' style="text-align:center;"':""}function s(e,n){var s="";return e=e.trim(),(r.tablesHeaderId||r.tableHeaderId)&&(s=' id="'+e.replace(/ /g,"_").toLowerCase()+'"'),e=a.subParser("spanGamut")(e,r,t),""+e+" \n"}function o(e,n){return""+a.subParser("spanGamut")(e,r,t)+" \n"}function i(e){var i,l=e.split("\n");for(i=0;i "+t.split("\n").join("\n> ")}),a.subParser("makeMarkdown.codeBlock",function(e,r){"use strict";var t=e.getAttribute("language"),a=e.getAttribute("precodenum");return"```"+t+"\n"+r.preList[a]+"\n```"}),a.subParser("makeMarkdown.codeSpan",function(e){"use strict";return"`"+e.innerHTML+"`"}),a.subParser("makeMarkdown.emphasis",function(e,r){"use strict";var t="";if(e.hasChildNodes()){t+="*";for(var n=e.childNodes,s=n.length,o=0;o",e.hasAttribute("width")&&e.hasAttribute("height")&&(r+=" ="+e.getAttribute("width")+"x"+e.getAttribute("height")),e.hasAttribute("title")&&(r+=' "'+e.getAttribute("title")+'"'),r+=")"),r}),a.subParser("makeMarkdown.links",function(e,r){"use strict";var t="";if(e.hasChildNodes()&&e.hasAttribute("href")){var n=e.childNodes,s=n.length;t="[";for(var o=0;o",e.hasAttribute("title")&&(t+=' "'+e.getAttribute("title")+'"'),t+=")"}return t}),a.subParser("makeMarkdown.list",function(e,r,t){"use strict";var n="";if(!e.hasChildNodes())return"";for(var s=e.childNodes,o=s.length,i=e.getAttribute("start")||1,l=0;ltr>th"),l=e.querySelectorAll("tbody>tr");for(t=0;t
(GFM Style)",type:"boolean"},requireSpaceBeforeHeadingText:{defaultValue:!1,description:"Makes adding a space between `#` and the header text mandatory (GFM Style)",type:"boolean"},ghMentions:{defaultValue:!1,description:"Enables github @mentions",type:"boolean"},ghMentionsLink:{defaultValue:"https://github.com/{u}",description:"Changes the link generated by @mentions. Only applies if ghMentions option is enabled.",type:"string"},encodeEmails:{defaultValue:!0,description:"Encode e-mail addresses through the use of Character Entities, transforming ASCII e-mail addresses into its equivalent decimal entities",type:"boolean"},openLinksInNewWindow:{defaultValue:!1,description:"Open all links in new windows",type:"boolean"},backslashEscapesHTMLTags:{defaultValue:!1,description:"Support for HTML Tag escaping. ex: [^\r]+?<\/pre>)/gm,function(e,r){return r.replace(/^ /gm,"¨0").replace(/¨0/g,"")}),x.subParser("hashBlock")("
","gim"),e=s.converter._dispatch("hashPreCodeTags.after",e,n,s)}),x.subParser("headers",function(e,n,s){"use strict";e=s.converter._dispatch("headers.before",e,n,s);var o=isNaN(parseInt(n.headerLevelStart))?1:parseInt(n.headerLevelStart),r=n.smoothLivePreview?/^(.+)[ \t]*\n={2,}[ \t]*\n+/gm:/^(.+)[ \t]*\n=+[ \t]*\n+/gm,t=n.smoothLivePreview?/^(.+)[ \t]*\n-{2,}[ \t]*\n+/gm:/^(.+)[ \t]*\n-+[ \t]*\n+/gm,r=(e=(e=e.replace(r,function(e,r){var t=x.subParser("spanGamut")(r,n,s),r=n.noHeaderId?"":' id="'+i(r)+'"',r="\n"+e+"\n
",r,t)}),e=t.converter._dispatch("blockQuotes.after",e,r,t)}),x.subParser("codeBlocks",function(e,n,s){"use strict";e=s.converter._dispatch("codeBlocks.before",e,n,s);return e=(e=(e+="¨0").replace(/(?:\n\n|^)((?:(?:[ ]{4}|\t).*\n+)+)(\n*[ ]{0,3}[^ \t\n]|(?=¨0))/g,function(e,r,t){var a="\n",r=x.subParser("outdent")(r,n,s);return r=x.subParser("encodeCode")(r,n,s),r="
",x.subParser("hashBlock")(r,n,s)+t})).replace(/¨0/,""),e=s.converter._dispatch("codeBlocks.after",e,n,s)}),x.subParser("codeSpans",function(e,n,s){"use strict";return e=(e=void 0===(e=s.converter._dispatch("codeSpans.before",e,n,s))?"":e).replace(/(^|[^\\])(`+)([^\r]*?[^`])\2(?!`)/gm,function(e,r,t,a){return a=(a=a.replace(/^([ \t]*)/g,"")).replace(/[ \t]*$/g,""),a=r+""+(r=(r=(r=x.subParser("detab")(r,n,s)).replace(/^\n+/g,"")).replace(/\n+$/g,""))+(a=n.omitExtraWLInCodeBlocks?"":a)+"
"+(a=x.subParser("encodeCode")(a,n,s))+"
",a=x.subParser("hashHTMLSpans")(a,n,s)}),e=s.converter._dispatch("codeSpans.after",e,n,s)}),x.subParser("completeHTMLDocument",function(e,r,t){"use strict";if(!r.completeHTMLDocument)return e;e=t.converter._dispatch("completeHTMLDocument.before",e,r,t);var a,n="html",s="\n",o="",i='\n',l="",c="";for(a in void 0!==t.metadata.parsed.doctype&&(s="\n","html"!==(n=t.metadata.parsed.doctype.toString().toLowerCase())&&"html5"!==n||(i='')),t.metadata.parsed)if(t.metadata.parsed.hasOwnProperty(a))switch(a.toLowerCase()){case"doctype":break;case"title":o="
",a=x.subParser("hashBlock")(a,s,o),"\n\n¨G"+(o.ghCodeBlocks.push({text:e,codeblock:a})-1)+"G\n\n"})).replace(/¨0/,""),o.converter._dispatch("githubCodeBlocks.after",e,s,o)):e}),x.subParser("hashBlock",function(e,r,t){"use strict";return e=(e=t.converter._dispatch("hashBlock.before",e,r,t)).replace(/(^\n+|\n+$)/g,""),e="\n\n¨K"+(t.gHtmlBlocks.push(e)-1)+"K\n\n",e=t.converter._dispatch("hashBlock.after",e,r,t)}),x.subParser("hashCodeTags",function(e,n,s){"use strict";e=s.converter._dispatch("hashCodeTags.before",e,n,s);return e=x.helper.replaceRecursiveRegExp(e,function(e,r,t,a){t=t+x.subParser("encodeCode")(r,n,s)+a;return"¨C"+(s.gHtmlSpans.push(t)-1)+"C"},""+(a=(a=(a=x.subParser("detab")(a,s,o)).replace(/^\n+/g,"")).replace(/\n+$/g,""))+n+"
]*>","
","gim"),e=s.converter._dispatch("hashCodeTags.after",e,n,s)}),x.subParser("hashElement",function(e,r,t){"use strict";return function(e,r){return r=(r=(r=r.replace(/\n\n/g,"\n")).replace(/^\n/,"")).replace(/\n+$/g,""),r="\n\n¨K"+(t.gHtmlBlocks.push(r)-1)+"K\n\n"}}),x.subParser("hashHTMLBlocks",function(e,r,n){"use strict";e=n.converter._dispatch("hashHTMLBlocks.before",e,r,n);function t(e,r,t,a){return-1!==t.search(/\bmarkdown\b/)&&(e=t+n.converter.makeHtml(r)+a),"\n\n¨K"+(n.gHtmlBlocks.push(e)-1)+"K\n\n"}var a=["pre","div","h1","h2","h3","h4","h5","h6","blockquote","table","dl","ol","ul","script","noscript","form","fieldset","iframe","math","style","section","header","footer","nav","article","aside","address","audio","canvas","figure","hgroup","output","video","p"];r.backslashEscapesHTMLTags&&(e=e.replace(/\\<(\/?[^>]+?)>/g,function(e,r){return"<"+r+">"}));for(var s=0;s]*>","^ {0,3}
\\s*
",r,t);return e=(e=(e=e.replace(/^ {0,2}( ?-){3,}[ \t]*$/gm,a)).replace(/^ {0,2}( ?\*){3,}[ \t]*$/gm,a)).replace(/^ {0,2}( ?_){3,}[ \t]*$/gm,a),e=t.converter._dispatch("horizontalRule.after",e,r,t)}),x.subParser("images",function(e,r,d){"use strict";function l(e,r,t,a,n,s,u,o){var i=d.gUrls,l=d.gTitles,c=d.gDimensions;if(t=t.toLowerCase(),o=o||"",-1
]*>/.test(l)&&(d=!0)}a[s]=l}return e=(e=(e=a.join("\n")).replace(/^\n+/g,"")).replace(/\n+$/g,""),t.converter._dispatch("paragraphs.after",e,r,t)}),x.subParser("runExtension",function(e,r,t,a){"use strict";return e.filter?r=e.filter(r,a.converter,t):e.regex&&((a=e.regex)instanceof RegExp||(a=new RegExp(a,"g")),r=r.replace(a,e.replace)),r}),x.subParser("spanGamut",function(e,r,t){"use strict";return e=t.converter._dispatch("spanGamut.before",e,r,t),e=x.subParser("codeSpans")(e,r,t),e=x.subParser("escapeSpecialCharsWithinTagAttributes")(e,r,t),e=x.subParser("encodeBackslashEscapes")(e,r,t),e=x.subParser("images")(e,r,t),e=x.subParser("anchors")(e,r,t),e=x.subParser("autoLinks")(e,r,t),e=x.subParser("simplifiedAutoLinks")(e,r,t),e=x.subParser("emoji")(e,r,t),e=x.subParser("underline")(e,r,t),e=x.subParser("italicsAndBold")(e,r,t),e=x.subParser("strikethrough")(e,r,t),e=x.subParser("ellipsis")(e,r,t),e=x.subParser("hashHTMLSpans")(e,r,t),e=x.subParser("encodeAmpsAndAngles")(e,r,t),r.simpleLineBreaks?/\n\n¨K/.test(e)||(e=e.replace(/\n+/g,"
\n")):e=e.replace(/ +\n/g,"
\n"),e=t.converter._dispatch("spanGamut.after",e,r,t)}),x.subParser("strikethrough",function(e,t,a){"use strict";return t.strikethrough&&(e=(e=a.converter._dispatch("strikethrough.before",e,t,a)).replace(/(?:~){2}([\s\S]+?)(?:~){2}/g,function(e,r){return r=r,""+(r=t.simplifiedAutoLink?x.subParser("simplifiedAutoLinks")(r,t,a):r)+""}),e=a.converter._dispatch("strikethrough.after",e,t,a)),e}),x.subParser("stripLinkDefinitions",function(i,l,c){"use strict";function e(e,r,t,a,n,s,o){return r=r.toLowerCase(),i.toLowerCase().split(r).length-1<2?e:(t.match(/^data:.+?\/.+?;base64,/)?c.gUrls[r]=t.replace(/\s/g,""):c.gUrls[r]=x.subParser("encodeAmpsAndAngles")(t,l,c),s?s+o:(o&&(c.gTitles[r]=o.replace(/"|'/g,""")),l.parseImgDimensions&&a&&n&&(c.gDimensions[r]={width:a,height:n}),""))}return i=(i=(i=(i+="¨0").replace(/^ {0,3}\[([^\]]+)]:[ \t]*\n?[ \t]*(data:.+?\/.+?;base64,[A-Za-z0-9+/=\n]+?)>?(?: =([*\d]+[A-Za-z%]{0,4})x([*\d]+[A-Za-z%]{0,4}))?[ \t]*\n?[ \t]*(?:(\n*)["|'(](.+?)["|')][ \t]*)?(?:\n\n|(?=¨0)|(?=\n\[))/gm,e)).replace(/^ {0,3}\[([^\]]+)]:[ \t]*\n?[ \t]*([^>\s]+)>?(?: =([*\d]+[A-Za-z%]{0,4})x([*\d]+[A-Za-z%]{0,4}))?[ \t]*\n?[ \t]*(?:(\n*)["|'(](.+?)["|')][ \t]*)?(?:\n+|(?=¨0))/gm,e)).replace(/¨0/,"")}),x.subParser("tables",function(e,y,P){"use strict";if(!y.tables)return e;function r(u){for(var e=u.split("\n"),r=0;r"+(a=x.subParser("spanGamut")(a,y,P))+"\n"));for(r=0;r"+x.subParser("spanGamut")(p,y,P)+"\n"));m.push(f)}for(var b=g,w=m,l="\n\n\n",k=b.length,c=0;c\n \n\n",c=0;c\n";for(var v=0;v\n"}return l+=" \n
\n"}return e=(e=(e=(e=P.converter._dispatch("tables.before",e,y,P)).replace(/\\(\|)/g,x.helper.escapeCharactersCallback)).replace(/^ {0,3}\|?.+\|.+\n {0,3}\|?[ \t]*:?[ \t]*(?:[-=]){2,}[ \t]*:?[ \t]*\|[ \t]*:?[ \t]*(?:[-=]){2,}[\s\S]+?(?:\n\n|¨0)/gm,r)).replace(/^ {0,3}\|.+\|[ \t]*\n {0,3}\|[ \t]*:?[ \t]*(?:[-=]){2,}[ \t]*:?[ \t]*\|[ \t]*\n( {0,3}\|.+\|[ \t]*\n)*(?:\n|¨0)/gm,r),e=P.converter._dispatch("tables.after",e,y,P)}),x.subParser("underline",function(e,r,t){"use strict";return r.underline?(e=t.converter._dispatch("underline.before",e,r,t),e=(e=r.literalMidWordUnderscores?(e=e.replace(/\b___(\S[\s\S]*?)___\b/g,function(e,r){return""+r+""})).replace(/\b__(\S[\s\S]*?)__\b/g,function(e,r){return""+r+""}):(e=e.replace(/___(\S[\s\S]*?)___/g,function(e,r){return/\S$/.test(r)?""+r+"":e})).replace(/__(\S[\s\S]*?)__/g,function(e,r){return/\S$/.test(r)?""+r+"":e})).replace(/(_)/g,x.helper.escapeCharactersCallback),t.converter._dispatch("underline.after",e,r,t)):e}),x.subParser("unescapeSpecialChars",function(e,r,t){"use strict";return e=(e=t.converter._dispatch("unescapeSpecialChars.before",e,r,t)).replace(/¨E(\d+)E/g,function(e,r){r=parseInt(r);return String.fromCharCode(r)}),e=t.converter._dispatch("unescapeSpecialChars.after",e,r,t)}),x.subParser("makeMarkdown.blockquote",function(e,r){"use strict";var t="";if(e.hasChildNodes())for(var a=e.childNodes,n=a.length,s=0;s ")}),x.subParser("makeMarkdown.codeBlock",function(e,r){"use strict";var t=e.getAttribute("language"),e=e.getAttribute("precodenum");return"```"+t+"\n"+r.preList[e]+"\n```"}),x.subParser("makeMarkdown.codeSpan",function(e){"use strict";return"`"+e.innerHTML+"`"}),x.subParser("makeMarkdown.emphasis",function(e,r){"use strict";var t="";if(e.hasChildNodes()){t+="*";for(var a=e.childNodes,n=a.length,s=0;s",e.hasAttribute("width")&&e.hasAttribute("height")&&(r+=" ="+e.getAttribute("width")+"x"+e.getAttribute("height")),e.hasAttribute("title")&&(r+=' "'+e.getAttribute("title")+'"'),r+=")"),r}),x.subParser("makeMarkdown.links",function(e,r){"use strict";var t="";if(e.hasChildNodes()&&e.hasAttribute("href")){for(var a=e.childNodes,n=a.length,t="[",s=0;s"),e.hasAttribute("title")&&(t+=' "'+e.getAttribute("title")+'"'),t+=")"}return t}),x.subParser("makeMarkdown.list",function(e,r,t){"use strict";var a="";if(!e.hasChildNodes())return"";for(var n=e.childNodes,s=n.length,o=e.getAttribute("start")||1,i=0;i"+r.preList[e]+""}),x.subParser("makeMarkdown.strikethrough",function(e,r){"use strict";var t="";if(e.hasChildNodes()){t+="~~";for(var a=e.childNodes,n=a.length,s=0;str>th"),s=e.querySelectorAll("tbody>tr"),o=0;o/g,"\\$1>")).replace(/^#/gm,"\\#")).replace(/^(\s*)([-=]{3,})(\s*)$/,"$1\\$2$3")).replace(/^( {0,3}\d+)\./gm,"$1\\.")).replace(/^( {0,3})([+-])/gm,"$1\\$2")).replace(/]([\s]*)\(/g,"\\]$1\\(")).replace(/^ {0,3}\[([\S \t]*?)]:/gm,"\\[$1]:")});"function"==typeof define&&define.amd?define(function(){"use strict";return x}):"undefined"!=typeof module&&module.exports?module.exports=x:this.showdown=x}.call(this);
diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php
index 650504db..f714a5e1 100644
--- a/tpl/bootstrap.php
+++ b/tpl/bootstrap.php
@@ -41,7 +41,7 @@ if ($SYNTAXHIGHLIGHTING) :
endif;
?>
-
+
@@ -55,7 +55,7 @@ if ($ZEROBINCOMPATIBILITY) :
endif;
?>
-
+
-
+
-
+
diff --git a/tpl/page.php b/tpl/page.php
index f54df219..b4ae12a5 100644
--- a/tpl/page.php
+++ b/tpl/page.php
@@ -20,7 +20,7 @@ if ($SYNTAXHIGHLIGHTING):
endif;
endif;
?>
-
+
@@ -34,7 +34,7 @@ if ($ZEROBINCOMPATIBILITY):
endif;
?>
-
+
-
+
-
+
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 2693674f..3f795c8a 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -12,6 +12,7 @@ return array(
'IPLib\\Address\\IPv6' => $vendorDir . '/mlocati/ip-lib/src/Address/IPv6.php',
'IPLib\\Address\\Type' => $vendorDir . '/mlocati/ip-lib/src/Address/Type.php',
'IPLib\\Factory' => $vendorDir . '/mlocati/ip-lib/src/Factory.php',
+ 'IPLib\\ParseStringFlag' => $vendorDir . '/mlocati/ip-lib/src/ParseStringFlag.php',
'IPLib\\Range\\AbstractRange' => $vendorDir . '/mlocati/ip-lib/src/Range/AbstractRange.php',
'IPLib\\Range\\Pattern' => $vendorDir . '/mlocati/ip-lib/src/Range/Pattern.php',
'IPLib\\Range\\RangeInterface' => $vendorDir . '/mlocati/ip-lib/src/Range/RangeInterface.php',
@@ -19,7 +20,8 @@ return array(
'IPLib\\Range\\Subnet' => $vendorDir . '/mlocati/ip-lib/src/Range/Subnet.php',
'IPLib\\Range\\Type' => $vendorDir . '/mlocati/ip-lib/src/Range/Type.php',
'IPLib\\Service\\BinaryMath' => $vendorDir . '/mlocati/ip-lib/src/Service/BinaryMath.php',
- 'IPLib\\Service\\RangesFromBounradyCalculator' => $vendorDir . '/mlocati/ip-lib/src/Service/RangesFromBounradyCalculator.php',
+ 'IPLib\\Service\\RangesFromBoundaryCalculator' => $vendorDir . '/mlocati/ip-lib/src/Service/RangesFromBoundaryCalculator.php',
+ 'IPLib\\Service\\UnsignedIntegerMath' => $vendorDir . '/mlocati/ip-lib/src/Service/UnsignedIntegerMath.php',
'Identicon\\Generator\\BaseGenerator' => $vendorDir . '/yzalis/identicon/src/Identicon/Generator/BaseGenerator.php',
'Identicon\\Generator\\GdGenerator' => $vendorDir . '/yzalis/identicon/src/Identicon/Generator/GdGenerator.php',
'Identicon\\Generator\\GeneratorInterface' => $vendorDir . '/yzalis/identicon/src/Identicon/Generator/GeneratorInterface.php',
@@ -41,7 +43,6 @@ return array(
'PrivateBin\\Model\\Comment' => $baseDir . '/lib/Model/Comment.php',
'PrivateBin\\Model\\Paste' => $baseDir . '/lib/Model/Paste.php',
'PrivateBin\\Persistence\\AbstractPersistence' => $baseDir . '/lib/Persistence/AbstractPersistence.php',
- 'PrivateBin\\Persistence\\DataStore' => $baseDir . '/lib/Persistence/DataStore.php',
'PrivateBin\\Persistence\\PurgeLimiter' => $baseDir . '/lib/Persistence/PurgeLimiter.php',
'PrivateBin\\Persistence\\ServerSalt' => $baseDir . '/lib/Persistence/ServerSalt.php',
'PrivateBin\\Persistence\\TrafficLimiter' => $baseDir . '/lib/Persistence/TrafficLimiter.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 58f7a58a..ab1f7d33 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -44,6 +44,7 @@ class ComposerStaticInitDontChange
'IPLib\\Address\\IPv6' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Address/IPv6.php',
'IPLib\\Address\\Type' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Address/Type.php',
'IPLib\\Factory' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Factory.php',
+ 'IPLib\\ParseStringFlag' => __DIR__ . '/..' . '/mlocati/ip-lib/src/ParseStringFlag.php',
'IPLib\\Range\\AbstractRange' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Range/AbstractRange.php',
'IPLib\\Range\\Pattern' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Range/Pattern.php',
'IPLib\\Range\\RangeInterface' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Range/RangeInterface.php',
@@ -51,7 +52,8 @@ class ComposerStaticInitDontChange
'IPLib\\Range\\Subnet' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Range/Subnet.php',
'IPLib\\Range\\Type' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Range/Type.php',
'IPLib\\Service\\BinaryMath' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Service/BinaryMath.php',
- 'IPLib\\Service\\RangesFromBounradyCalculator' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Service/RangesFromBounradyCalculator.php',
+ 'IPLib\\Service\\RangesFromBoundaryCalculator' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Service/RangesFromBoundaryCalculator.php',
+ 'IPLib\\Service\\UnsignedIntegerMath' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Service/UnsignedIntegerMath.php',
'Identicon\\Generator\\BaseGenerator' => __DIR__ . '/..' . '/yzalis/identicon/src/Identicon/Generator/BaseGenerator.php',
'Identicon\\Generator\\GdGenerator' => __DIR__ . '/..' . '/yzalis/identicon/src/Identicon/Generator/GdGenerator.php',
'Identicon\\Generator\\GeneratorInterface' => __DIR__ . '/..' . '/yzalis/identicon/src/Identicon/Generator/GeneratorInterface.php',
@@ -73,7 +75,6 @@ class ComposerStaticInitDontChange
'PrivateBin\\Model\\Comment' => __DIR__ . '/../..' . '/lib/Model/Comment.php',
'PrivateBin\\Model\\Paste' => __DIR__ . '/../..' . '/lib/Model/Paste.php',
'PrivateBin\\Persistence\\AbstractPersistence' => __DIR__ . '/../..' . '/lib/Persistence/AbstractPersistence.php',
- 'PrivateBin\\Persistence\\DataStore' => __DIR__ . '/../..' . '/lib/Persistence/DataStore.php',
'PrivateBin\\Persistence\\PurgeLimiter' => __DIR__ . '/../..' . '/lib/Persistence/PurgeLimiter.php',
'PrivateBin\\Persistence\\ServerSalt' => __DIR__ . '/../..' . '/lib/Persistence/ServerSalt.php',
'PrivateBin\\Persistence\\TrafficLimiter' => __DIR__ . '/../..' . '/lib/Persistence/TrafficLimiter.php',
diff --git a/vendor/mlocati/ip-lib/src/Address/AddressInterface.php b/vendor/mlocati/ip-lib/src/Address/AddressInterface.php
index 3b254c42..f484c621 100644
--- a/vendor/mlocati/ip-lib/src/Address/AddressInterface.php
+++ b/vendor/mlocati/ip-lib/src/Address/AddressInterface.php
@@ -21,6 +21,8 @@ interface AddressInterface
*
* @return int
*
+ * @since 1.14.0
+ *
* @example 32 for IPv4
* @example 128 for IPv6
*/
@@ -51,6 +53,8 @@ interface AddressInterface
*
* @return string
*
+ * @since 1.14.0
+ *
* @example For localhost: For IPv4 you'll get '01111111000000000000000000000001' (32 digits), for IPv6 '00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001' (128 digits)
*/
public function getBits();
@@ -66,6 +70,8 @@ interface AddressInterface
* Get the default RFC reserved range type.
*
* @return int One of the \IPLib\Range\Type::T_... constants
+ *
+ * @since 1.5.0
*/
public static function getDefaultReservedRangeType();
@@ -73,6 +79,8 @@ interface AddressInterface
* Get the RFC reserved ranges (except the ones of type getDefaultReservedRangeType).
*
* @return \IPLib\Address\AssignedRange[] ranges are sorted
+ *
+ * @since 1.5.0
*/
public static function getReservedRanges();
@@ -99,10 +107,28 @@ interface AddressInterface
*/
public function matches(RangeInterface $range);
+ /**
+ * Get the address at a certain distance from this address.
+ *
+ * @param int $n the distance of the address (can be negative)
+ *
+ * @return \IPLib\Address\AddressInterface|null return NULL if $n is not an integer or if the final address would be invalid
+ *
+ * @since 1.15.0
+ *
+ * @example passing 1 to the address 127.0.0.1 will result in 127.0.0.2
+ * @example passing -1 to the address 127.0.0.1 will result in 127.0.0.0
+ * @example passing -1 to the address 0.0.0.0 will result in NULL
+ */
+ public function getAddressAtOffset($n);
+
/**
* Get the address right after this IP address (if available).
*
* @return \IPLib\Address\AddressInterface|null
+ *
+ * @see \IPLib\Address\AddressInterface::getAddressAtOffset()
+ * @since 1.4.0
*/
public function getNextAddress();
@@ -110,6 +136,9 @@ interface AddressInterface
* Get the address right before this IP address (if available).
*
* @return \IPLib\Address\AddressInterface|null
+ *
+ * @see \IPLib\Address\AddressInterface::getAddressAtOffset()
+ * @since 1.4.0
*/
public function getPreviousAddress();
@@ -118,6 +147,8 @@ interface AddressInterface
*
* @return string
*
+ * @since 1.12.0
+ *
* @example for IPv4 it returns something like x.x.x.x.in-addr.arpa
* @example for IPv6 it returns something like x.x.x.x..x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.ip6.arpa
*/
diff --git a/vendor/mlocati/ip-lib/src/Address/AssignedRange.php b/vendor/mlocati/ip-lib/src/Address/AssignedRange.php
index c5db08dd..3d6fa532 100644
--- a/vendor/mlocati/ip-lib/src/Address/AssignedRange.php
+++ b/vendor/mlocati/ip-lib/src/Address/AssignedRange.php
@@ -6,6 +6,8 @@ use IPLib\Range\RangeInterface;
/**
* Represents an IP address range with an assigned range type.
+ *
+ * @since 1.5.0
*/
class AssignedRange
{
diff --git a/vendor/mlocati/ip-lib/src/Address/IPv4.php b/vendor/mlocati/ip-lib/src/Address/IPv4.php
index d31338e5..cd2c416f 100644
--- a/vendor/mlocati/ip-lib/src/Address/IPv4.php
+++ b/vendor/mlocati/ip-lib/src/Address/IPv4.php
@@ -2,6 +2,7 @@
namespace IPLib\Address;
+use IPLib\ParseStringFlag;
use IPLib\Range\RangeInterface;
use IPLib\Range\Subnet;
use IPLib\Range\Type as RangeType;
@@ -46,7 +47,7 @@ class IPv4 implements AddressInterface
*
* @var array|null
*/
- private static $reservedRanges = null;
+ private static $reservedRanges;
/**
* Initializes the instance.
@@ -82,52 +83,94 @@ class IPv4 implements AddressInterface
}
/**
- * Parse a string and returns an IPv4 instance if the string is valid, or null otherwise.
+ * @deprecated since 1.17.0: use the parseString() method instead.
+ * For upgrading:
+ * - if $mayIncludePort is true, use the ParseStringFlag::MAY_INCLUDE_PORT flag
+ * - if $supportNonDecimalIPv4 is true, use the ParseStringFlag::IPV4_MAYBE_NON_DECIMAL flag
*
* @param string|mixed $address the address to parse
- * @param bool $mayIncludePort set to false to avoid parsing addresses with ports
- * @param bool $supportNonDecimalIPv4 set to true to support parsing non decimal (that is, octal and hexadecimal) IPv4 addresses
+ * @param bool $mayIncludePort
+ * @param bool $supportNonDecimalIPv4
*
* @return static|null
+ *
+ * @see \IPLib\Address\IPv4::parseString()
+ * @since 1.1.0 added the $mayIncludePort argument
+ * @since 1.10.0 added the $supportNonDecimalIPv4 argument
*/
public static function fromString($address, $mayIncludePort = true, $supportNonDecimalIPv4 = false)
{
- if (!is_string($address) || !strpos($address, '.')) {
+ return static::parseString($address, 0 | ($mayIncludePort ? ParseStringFlag::MAY_INCLUDE_PORT : 0) | ($supportNonDecimalIPv4 ? ParseStringFlag::IPV4_MAYBE_NON_DECIMAL : 0));
+ }
+
+ /**
+ * Parse a string and returns an IPv4 instance if the string is valid, or null otherwise.
+ *
+ * @param string|mixed $address the address to parse
+ * @param int $flags A combination or zero or more flags
+ *
+ * @return static|null
+ *
+ * @see \IPLib\ParseStringFlag
+ * @since 1.17.0
+ */
+ public static function parseString($address, $flags = 0)
+ {
+ if (!is_string($address)) {
return null;
}
- $rxChunk = '0?[0-9]{1,3}';
- if ($supportNonDecimalIPv4) {
- $rxChunk = "(?:0[Xx]0*[0-9A-Fa-f]{1,2})|(?:{$rxChunk})";
+ $flags = (int) $flags;
+ $matches = null;
+ if ($flags & ParseStringFlag::ADDRESS_MAYBE_RDNS) {
+ if (preg_match('/^([12]?[0-9]{1,2}\.[12]?[0-9]{1,2}\.[12]?[0-9]{1,2}\.[12]?[0-9]{1,2})\.in-addr\.arpa\.?$/i', $address, $matches)) {
+ $address = implode('.', array_reverse(explode('.', $matches[1])));
+ $flags = $flags & ~(ParseStringFlag::IPV4_MAYBE_NON_DECIMAL | ParseStringFlag::IPV4ADDRESS_MAYBE_NON_QUAD_DOTTED);
+ }
}
- $rx = "0*?({$rxChunk})\.0*?({$rxChunk})\.0*?({$rxChunk})\.0*?({$rxChunk})";
- if ($mayIncludePort) {
+ if ($flags & ParseStringFlag::IPV4ADDRESS_MAYBE_NON_QUAD_DOTTED) {
+ if (strpos($address, '.') === 0) {
+ return null;
+ }
+ $lengthNonHex = '{1,11}';
+ $lengthHex = '{1,8}';
+ $chunk234Optional = true;
+ } else {
+ if (!strpos($address, '.')) {
+ return null;
+ }
+ $lengthNonHex = '{1,3}';
+ $lengthHex = '{1,2}';
+ $chunk234Optional = false;
+ }
+ $rxChunk1 = "0?[0-9]{$lengthNonHex}";
+ if ($flags & ParseStringFlag::IPV4_MAYBE_NON_DECIMAL) {
+ $rxChunk1 = "(?:0[Xx]0*[0-9A-Fa-f]{$lengthHex})|(?:{$rxChunk1})";
+ $onlyDecimal = false;
+ } else {
+ $onlyDecimal = true;
+ }
+ $rxChunk1 = "0*?({$rxChunk1})";
+ $rxChunk234 = "\.{$rxChunk1}";
+ if ($chunk234Optional) {
+ $rxChunk234 = "(?:{$rxChunk234})?";
+ }
+ $rx = "{$rxChunk1}{$rxChunk234}{$rxChunk234}{$rxChunk234}";
+ if ($flags & ParseStringFlag::MAY_INCLUDE_PORT) {
$rx .= '(?::\d+)?';
}
- $matches = null;
if (!preg_match('/^' . $rx . '$/', $address, $matches)) {
return null;
}
+ $math = new \IPLib\Service\UnsignedIntegerMath();
$nums = array();
- for ($i = 1; $i <= 4; $i++) {
- $s = $matches[$i];
- if ($supportNonDecimalIPv4) {
- if (stripos($s, '0x') === 0) {
- $n = hexdec(substr($s, 2));
- } elseif ($s[0] === '0') {
- if (!preg_match('/^[0-7]+$/', $s)) {
- return null;
- }
- $n = octdec(substr($s, 1));
- } else {
- $n = (int) $s;
- }
- } else {
- $n = (int) $s;
- }
- if ($n < 0 || $n > 255) {
+ $maxChunkIndex = count($matches) - 1;
+ for ($i = 1; $i <= $maxChunkIndex; $i++) {
+ $numBytes = $i === $maxChunkIndex ? 5 - $i : 1;
+ $chunkBytes = $math->getBytes($matches[$i], $numBytes, $onlyDecimal);
+ if ($chunkBytes === null) {
return null;
}
- $nums[] = (string) $n;
+ $nums = array_merge($nums, $chunkBytes);
}
return new static(implode('.', $nums));
@@ -179,6 +222,8 @@ class IPv4 implements AddressInterface
*
* @return string
*
+ * @since 1.10.0
+ *
* @example if $long == false: if the decimal representation is '0.7.8.255': '0.7.010.0377'
* @example if $long == true: if the decimal representation is '0.7.8.255': '0000.0007.0010.0377'
*/
@@ -203,6 +248,8 @@ class IPv4 implements AddressInterface
*
* @return string
*
+ * @since 1.10.0
+ *
* @example if $long == false: if the decimal representation is '0.9.10.255': '0.9.0xa.0xff'
* @example if $long == true: if the decimal representation is '0.9.10.255': '0x00.0x09.0x0a.0xff'
*/
@@ -318,10 +365,10 @@ class IPv4 implements AddressInterface
$exceptions = array();
if (isset($data[1])) {
foreach ($data[1] as $exceptionRange => $exceptionType) {
- $exceptions[] = new AssignedRange(Subnet::fromString($exceptionRange), $exceptionType);
+ $exceptions[] = new AssignedRange(Subnet::parseString($exceptionRange), $exceptionType);
}
}
- $reservedRanges[] = new AssignedRange(Subnet::fromString($range), $data[0], $exceptions);
+ $reservedRanges[] = new AssignedRange(Subnet::parseString($range), $data[0], $exceptions);
}
self::$reservedRanges = $reservedRanges;
}
@@ -359,13 +406,15 @@ class IPv4 implements AddressInterface
{
$myBytes = $this->getBytes();
- return IPv6::fromString('2002:' . sprintf('%02x', $myBytes[0]) . sprintf('%02x', $myBytes[1]) . ':' . sprintf('%02x', $myBytes[2]) . sprintf('%02x', $myBytes[3]) . '::');
+ return IPv6::parseString('2002:' . sprintf('%02x', $myBytes[0]) . sprintf('%02x', $myBytes[1]) . ':' . sprintf('%02x', $myBytes[2]) . sprintf('%02x', $myBytes[3]) . '::');
}
/**
* Create an IPv6 representation of this address (in IPv6 IPv4-mapped notation).
*
* @return \IPLib\Address\IPv6
+ *
+ * @since 1.11.0
*/
public function toIPv6IPv4Mapped()
{
@@ -400,6 +449,37 @@ class IPv4 implements AddressInterface
return $range->contains($this);
}
+ /**
+ * {@inheritdoc}
+ *
+ * @see \IPLib\Address\AddressInterface::getAddressAtOffset()
+ */
+ public function getAddressAtOffset($n)
+ {
+ if (!is_int($n)) {
+ return null;
+ }
+
+ $boundary = 256;
+ $mod = $n;
+ $bytes = $this->getBytes();
+ for ($i = count($bytes) - 1; $i >= 0; $i--) {
+ $tmp = ($bytes[$i] + $mod) % $boundary;
+ $mod = (int) floor(($bytes[$i] + $mod) / $boundary);
+ if ($tmp < 0) {
+ $tmp += $boundary;
+ }
+
+ $bytes[$i] = $tmp;
+ }
+
+ if ($mod !== 0) {
+ return null;
+ }
+
+ return static::fromBytes($bytes);
+ }
+
/**
* {@inheritdoc}
*
@@ -407,22 +487,7 @@ class IPv4 implements AddressInterface
*/
public function getNextAddress()
{
- $overflow = false;
- $bytes = $this->getBytes();
- for ($i = count($bytes) - 1; $i >= 0; $i--) {
- if ($bytes[$i] === 255) {
- if ($i === 0) {
- $overflow = true;
- break;
- }
- $bytes[$i] = 0;
- } else {
- $bytes[$i]++;
- break;
- }
- }
-
- return $overflow ? null : static::fromBytes($bytes);
+ return $this->getAddressAtOffset(1);
}
/**
@@ -432,22 +497,7 @@ class IPv4 implements AddressInterface
*/
public function getPreviousAddress()
{
- $overflow = false;
- $bytes = $this->getBytes();
- for ($i = count($bytes) - 1; $i >= 0; $i--) {
- if ($bytes[$i] === 0) {
- if ($i === 0) {
- $overflow = true;
- break;
- }
- $bytes[$i] = 255;
- } else {
- $bytes[$i]--;
- break;
- }
- }
-
- return $overflow ? null : static::fromBytes($bytes);
+ return $this->getAddressAtOffset(-1);
}
/**
diff --git a/vendor/mlocati/ip-lib/src/Address/IPv6.php b/vendor/mlocati/ip-lib/src/Address/IPv6.php
index 36664878..e094881b 100644
--- a/vendor/mlocati/ip-lib/src/Address/IPv6.php
+++ b/vendor/mlocati/ip-lib/src/Address/IPv6.php
@@ -2,6 +2,7 @@
namespace IPLib\Address;
+use IPLib\ParseStringFlag;
use IPLib\Range\RangeInterface;
use IPLib\Range\Subnet;
use IPLib\Range\Type as RangeType;
@@ -55,7 +56,7 @@ class IPv6 implements AddressInterface
*
* @var array|null
*/
- private static $reservedRanges = null;
+ private static $reservedRanges;
/**
* Initializes the instance.
@@ -92,32 +93,69 @@ class IPv6 implements AddressInterface
}
/**
- * Parse a string and returns an IPv6 instance if the string is valid, or null otherwise.
+ * @deprecated since 1.17.0: use the parseString() method instead.
+ * For upgrading:
+ * - if $mayIncludePort is true, use the ParseStringFlag::MAY_INCLUDE_PORT flag
+ * - if $mayIncludeZoneID is true, use the ParseStringFlag::MAY_INCLUDE_ZONEID flag
*
- * @param string|mixed $address the address to parse
- * @param bool $mayIncludePort set to false to avoid parsing addresses with ports
- * @param bool $mayIncludeZoneID set to false to avoid parsing addresses with zone IDs (see RFC 4007)
+ * @param string|mixed $address
+ * @param bool $mayIncludePort
+ * @param bool $mayIncludeZoneID
*
* @return static|null
+ *
+ * @see \IPLib\Address\IPv6::parseString()
+ * @since 1.1.0 added the $mayIncludePort argument
+ * @since 1.3.0 added the $mayIncludeZoneID argument
*/
public static function fromString($address, $mayIncludePort = true, $mayIncludeZoneID = true)
{
+ return static::parseString($address, 0 | ($mayIncludePort ? ParseStringFlag::MAY_INCLUDE_PORT : 0) | ($mayIncludeZoneID ? ParseStringFlag::MAY_INCLUDE_ZONEID : 0));
+ }
+
+ /**
+ * Parse a string and returns an IPv6 instance if the string is valid, or null otherwise.
+ *
+ * @param string|mixed $address the address to parse
+ * @param int $flags A combination or zero or more flags
+ *
+ * @return static|null
+ *
+ * @see \IPLib\ParseStringFlag
+ * @since 1.17.0
+ */
+ public static function parseString($address, $flags = 0)
+ {
+ if (!is_string($address)) {
+ return null;
+ }
+ $matches = null;
+ $flags = (int) $flags;
+ if ($flags & ParseStringFlag::ADDRESS_MAYBE_RDNS) {
+ if (preg_match('/^([0-9a-f](?:\.[0-9a-f]){31})\.ip6\.arpa\.?/i', $address, $matches)) {
+ $nibbles = array_reverse(explode('.', $matches[1]));
+ $quibbles = array();
+ foreach (array_chunk($nibbles, 4) as $n) {
+ $quibbles[] = implode('', $n);
+ }
+ $address = implode(':', $quibbles);
+ }
+ }
$result = null;
if (is_string($address) && strpos($address, ':') !== false && strpos($address, ':::') === false) {
- $matches = null;
- if ($mayIncludePort && $address[0] === '[' && preg_match('/^\[(.+)]:\d+$/', $address, $matches)) {
+ if ($flags & ParseStringFlag::MAY_INCLUDE_PORT && $address[0] === '[' && preg_match('/^\[(.+)]:\d+$/', $address, $matches)) {
$address = $matches[1];
}
- if ($mayIncludeZoneID) {
+ if ($flags & ParseStringFlag::MAY_INCLUDE_ZONEID) {
$percentagePos = strpos($address, '%');
if ($percentagePos > 0) {
$address = substr($address, 0, $percentagePos);
}
}
if (preg_match('/^((?:[0-9a-f]*:+)+)(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/i', $address, $matches)) {
- $address6 = static::fromString($matches[1] . '0:0', false);
+ $address6 = static::parseString($matches[1] . '0:0');
if ($address6 !== null) {
- $address4 = IPv4::fromString($matches[2], false);
+ $address4 = IPv4::parseString($matches[2]);
if ($address4 !== null) {
$bytes4 = $address4->getBytes();
$address6->longAddress = substr($address6->longAddress, 0, -9) . sprintf('%02x%02x:%02x%02x', $bytes4[0], $bytes4[1], $bytes4[2], $bytes4[3]);
@@ -401,10 +439,10 @@ class IPv6 implements AddressInterface
$exceptions = array();
if (isset($data[1])) {
foreach ($data[1] as $exceptionRange => $exceptionType) {
- $exceptions[] = new AssignedRange(Subnet::fromString($exceptionRange), $exceptionType);
+ $exceptions[] = new AssignedRange(Subnet::parseString($exceptionRange), $exceptionType);
}
}
- $reservedRanges[] = new AssignedRange(Subnet::fromString($range), $data[0], $exceptions);
+ $reservedRanges[] = new AssignedRange(Subnet::parseString($range), $data[0], $exceptions);
}
self::$reservedRanges = $reservedRanges;
}
@@ -471,6 +509,7 @@ class IPv6 implements AddressInterface
* @example '0000:0000:0000:0000:0000:0000:013.001.068.003' when $ipV6Long and $ipV4Long are true
*
* @see https://tools.ietf.org/html/rfc4291#section-2.2 point 3.
+ * @since 1.9.0
*/
public function toMixedIPv6IPv4String($ipV6Long = false, $ipV4Long = false)
{
@@ -503,6 +542,37 @@ class IPv6 implements AddressInterface
return $range->contains($this);
}
+ /**
+ * {@inheritdoc}
+ *
+ * @see \IPLib\Address\AddressInterface::getAddressAtOffset()
+ */
+ public function getAddressAtOffset($n)
+ {
+ if (!is_int($n)) {
+ return null;
+ }
+
+ $boundary = 0x10000;
+ $mod = $n;
+ $words = $this->getWords();
+ for ($i = count($words) - 1; $i >= 0; $i--) {
+ $tmp = ($words[$i] + $mod) % $boundary;
+ $mod = (int) floor(($words[$i] + $mod) / $boundary);
+ if ($tmp < 0) {
+ $tmp += $boundary;
+ }
+
+ $words[$i] = $tmp;
+ }
+
+ if ($mod !== 0) {
+ return null;
+ }
+
+ return static::fromWords($words);
+ }
+
/**
* {@inheritdoc}
*
@@ -510,22 +580,7 @@ class IPv6 implements AddressInterface
*/
public function getNextAddress()
{
- $overflow = false;
- $words = $this->getWords();
- for ($i = count($words) - 1; $i >= 0; $i--) {
- if ($words[$i] === 0xffff) {
- if ($i === 0) {
- $overflow = true;
- break;
- }
- $words[$i] = 0;
- } else {
- $words[$i]++;
- break;
- }
- }
-
- return $overflow ? null : static::fromWords($words);
+ return $this->getAddressAtOffset(1);
}
/**
@@ -535,22 +590,7 @@ class IPv6 implements AddressInterface
*/
public function getPreviousAddress()
{
- $overflow = false;
- $words = $this->getWords();
- for ($i = count($words) - 1; $i >= 0; $i--) {
- if ($words[$i] === 0) {
- if ($i === 0) {
- $overflow = true;
- break;
- }
- $words[$i] = 0xffff;
- } else {
- $words[$i]--;
- break;
- }
- }
-
- return $overflow ? null : static::fromWords($words);
+ return $this->getAddressAtOffset(-1);
}
/**
diff --git a/vendor/mlocati/ip-lib/src/Address/Type.php b/vendor/mlocati/ip-lib/src/Address/Type.php
index 06b07535..17488f38 100644
--- a/vendor/mlocati/ip-lib/src/Address/Type.php
+++ b/vendor/mlocati/ip-lib/src/Address/Type.php
@@ -27,6 +27,8 @@ class Type
* @param int $type
*
* @return string
+ *
+ * @since 1.1.0
*/
public static function getName($type)
{
diff --git a/vendor/mlocati/ip-lib/src/Factory.php b/vendor/mlocati/ip-lib/src/Factory.php
index 76b6e1e4..31b21d41 100644
--- a/vendor/mlocati/ip-lib/src/Factory.php
+++ b/vendor/mlocati/ip-lib/src/Factory.php
@@ -4,7 +4,7 @@ namespace IPLib;
use IPLib\Address\AddressInterface;
use IPLib\Range\Subnet;
-use IPLib\Service\RangesFromBounradyCalculator;
+use IPLib\Service\RangesFromBoundaryCalculator;
/**
* Factory methods to build class instances.
@@ -12,23 +12,48 @@ use IPLib\Service\RangesFromBounradyCalculator;
class Factory
{
/**
- * Parse an IP address string.
+ * @deprecated since 1.17.0: use the parseAddressString() method instead.
+ * For upgrading:
+ * - if $mayIncludePort is true, use the ParseStringFlag::MAY_INCLUDE_PORT flag
+ * - if $mayIncludeZoneID is true, use the ParseStringFlag::MAY_INCLUDE_ZONEID flag
+ * - if $supportNonDecimalIPv4 is true, use the ParseStringFlag::IPV4_MAYBE_NON_DECIMAL flag
*
- * @param string $address the address to parse
- * @param bool $mayIncludePort set to false to avoid parsing addresses with ports
- * @param bool $mayIncludeZoneID set to false to avoid parsing IPv6 addresses with zone IDs (see RFC 4007)
- * @param bool $supportNonDecimalIPv4 set to true to support parsing non decimal (that is, octal and hexadecimal) IPv4 addresses
+ * @param string|mixed $address
+ * @param bool $mayIncludePort
+ * @param bool $mayIncludeZoneID
+ * @param bool $supportNonDecimalIPv4
*
* @return \IPLib\Address\AddressInterface|null
+ *
+ * @see \IPLib\Factory::parseAddressString()
+ * @since 1.1.0 added the $mayIncludePort argument
+ * @since 1.3.0 added the $mayIncludeZoneID argument
+ * @since 1.10.0 added the $supportNonDecimalIPv4 argument
*/
public static function addressFromString($address, $mayIncludePort = true, $mayIncludeZoneID = true, $supportNonDecimalIPv4 = false)
+ {
+ return static::parseAddressString($address, 0 + ($mayIncludePort ? ParseStringFlag::MAY_INCLUDE_PORT : 0) + ($mayIncludeZoneID ? ParseStringFlag::MAY_INCLUDE_ZONEID : 0) + ($supportNonDecimalIPv4 ? ParseStringFlag::IPV4_MAYBE_NON_DECIMAL : 0));
+ }
+
+ /**
+ * Parse an IP address string.
+ *
+ * @param string|mixed $address the address to parse
+ * @param int $flags A combination or zero or more flags
+ *
+ * @return \IPLib\Address\AddressInterface|null
+ *
+ * @see \IPLib\ParseStringFlag
+ * @since 1.17.0
+ */
+ public static function parseAddressString($address, $flags = 0)
{
$result = null;
if ($result === null) {
- $result = Address\IPv4::fromString($address, $mayIncludePort, $supportNonDecimalIPv4);
+ $result = Address\IPv4::parseString($address, $flags);
}
if ($result === null) {
- $result = Address\IPv6::fromString($address, $mayIncludePort, $mayIncludeZoneID);
+ $result = Address\IPv6::parseString($address, $flags);
}
return $result;
@@ -54,59 +79,125 @@ class Factory
return $result;
}
+ /**
+ * @deprecated since 1.17.0: use the parseRangeString() method instead.
+ * For upgrading:
+ * - if $supportNonDecimalIPv4 is true, use the ParseStringFlag::IPV4_MAYBE_NON_DECIMAL flag
+ *
+ * @param string|mixed $address
+ * @param bool $supportNonDecimalIPv4
+ *
+ * @return \IPLib\Address\AddressInterface|null
+ *
+ * @see \IPLib\Factory::parseRangeString()
+ * @since 1.10.0 added the $supportNonDecimalIPv4 argument
+ */
+ public static function rangeFromString($address, $supportNonDecimalIPv4 = false)
+ {
+ return static::parseRangeString($address, $supportNonDecimalIPv4 ? ParseStringFlag::IPV4_MAYBE_NON_DECIMAL : 0);
+ }
+
/**
* Parse an IP range string.
*
* @param string $range
- * @param bool $supportNonDecimalIPv4 set to true to support parsing non decimal (that is, octal and hexadecimal) IPv4 addresses
+ * @param int $flags A combination or zero or more flags
*
* @return \IPLib\Range\RangeInterface|null
+ *
+ * @see \IPLib\ParseStringFlag
+ * @since 1.17.0
*/
- public static function rangeFromString($range, $supportNonDecimalIPv4 = false)
+ public static function parseRangeString($range, $flags = 0)
{
$result = null;
if ($result === null) {
- $result = Range\Subnet::fromString($range, $supportNonDecimalIPv4);
+ $result = Range\Subnet::parseString($range, $flags);
}
if ($result === null) {
- $result = Range\Pattern::fromString($range, $supportNonDecimalIPv4);
+ $result = Range\Pattern::parseString($range, $flags);
}
if ($result === null) {
- $result = Range\Single::fromString($range, $supportNonDecimalIPv4);
+ $result = Range\Single::parseString($range, $flags);
}
return $result;
}
/**
- * Create the smallest address range that comprises two addresses.
+ * @deprecated since 1.17.0: use the getRangeFromBoundaries() method instead.
+ * For upgrading:
+ * - if $supportNonDecimalIPv4 is true, use the ParseStringFlag::IPV4_MAYBE_NON_DECIMAL flag
*
- * @param string|\IPLib\Address\AddressInterface $from
- * @param string|\IPLib\Address\AddressInterface $to
- * @param bool $supportNonDecimalIPv4 set to true to support parsing non decimal (that is, octal and hexadecimal) IPv4 addresses
+ * @param string|\IPLib\Address\AddressInterface|mixed $from
+ * @param string|\IPLib\Address\AddressInterface|mixed $to
+ * @param bool $supportNonDecimalIPv4
*
- * @return \IPLib\Range\RangeInterface|null return NULL if $from and/or $to are invalid addresses, or if both are NULL or empty strings, or if they are addresses of different types
+ * @return \IPLib\Address\AddressInterface|null
+ *
+ * @see \IPLib\Factory::getRangeFromBoundaries()
+ * @since 1.2.0
+ * @since 1.10.0 added the $supportNonDecimalIPv4 argument
*/
public static function rangeFromBoundaries($from, $to, $supportNonDecimalIPv4 = false)
{
- list($from, $to) = self::parseBoundaries($from, $to, $supportNonDecimalIPv4);
+ return static::getRangeFromBoundaries($from, $to, ParseStringFlag::MAY_INCLUDE_PORT | ParseStringFlag::MAY_INCLUDE_ZONEID | ($supportNonDecimalIPv4 ? ParseStringFlag::IPV4_MAYBE_NON_DECIMAL : 0));
+ }
+
+ /**
+ * Create the smallest address range that comprises two addresses.
+ *
+ * @param string|\IPLib\Address\AddressInterface|mixed $from
+ * @param string|\IPLib\Address\AddressInterface|mixed $to
+ * @param int $flags A combination or zero or more flags
+ *
+ * @return \IPLib\Range\RangeInterface|null return NULL if $from and/or $to are invalid addresses, or if both are NULL or empty strings, or if they are addresses of different types
+ *
+ * @see \IPLib\ParseStringFlag
+ * @since 1.17.0
+ */
+ public static function getRangeFromBoundaries($from, $to, $flags = 0)
+ {
+ list($from, $to) = self::parseBoundaries($from, $to, $flags);
return $from === false || $to === false ? null : static::rangeFromBoundaryAddresses($from, $to);
}
+ /**
+ * @deprecated since 1.17.0: use the getRangesFromBoundaries() method instead.
+ * For upgrading:
+ * - if $supportNonDecimalIPv4 is true, use the ParseStringFlag::IPV4_MAYBE_NON_DECIMAL flag
+ *
+ * @param string|\IPLib\Address\AddressInterface|mixed $from
+ * @param string|\IPLib\Address\AddressInterface|mixed $to
+ * @param bool $supportNonDecimalIPv4
+ *
+ * @return \IPLib\Range\Subnet[]|null
+ *
+ * @see \IPLib\Factory::getRangesFromBoundaries()
+ * @since 1.14.0
+ */
+ public static function rangesFromBoundaries($from, $to, $supportNonDecimalIPv4 = false)
+ {
+ return static::getRangesFromBoundaries($from, $to, ParseStringFlag::MAY_INCLUDE_PORT | ParseStringFlag::MAY_INCLUDE_ZONEID | ($supportNonDecimalIPv4 ? ParseStringFlag::IPV4_MAYBE_NON_DECIMAL : 0));
+ }
+
/**
* Create a list of Range instances that exactly describes all the addresses between the two provided addresses.
*
* @param string|\IPLib\Address\AddressInterface $from
* @param string|\IPLib\Address\AddressInterface $to
- * @param bool $supportNonDecimalIPv4 set to true to support parsing non decimal (that is, octal and hexadecimal) IPv4 addresses
+ * @param int $flags A combination or zero or more flags
*
* @return \IPLib\Range\Subnet[]|null return NULL if $from and/or $to are invalid addresses, or if both are NULL or empty strings, or if they are addresses of different types
+ *
+ * @see \IPLib\ParseStringFlag
+ * @since 1.17.0
*/
- public static function rangesFromBoundaries($from, $to, $supportNonDecimalIPv4 = false)
+ public static function getRangesFromBoundaries($from, $to, $flags = 0)
{
- list($from, $to) = self::parseBoundaries($from, $to, $supportNonDecimalIPv4);
- if (($from === false || $to === false) || ($from === null && $to === null)) {
+ list($from, $to) = self::parseBoundaries($from, $to, $flags);
+ if ($from === false || $to === false || ($from === null && $to === null)) {
return null;
}
if ($from === null || $to === null) {
@@ -118,7 +209,7 @@ class Factory
if ($to->getNumberOfBits() !== $numberOfBits) {
return null;
}
- $calculator = new RangesFromBounradyCalculator($numberOfBits);
+ $calculator = new RangesFromBoundaryCalculator($numberOfBits);
return $calculator->getRanges($from, $to);
}
@@ -128,6 +219,8 @@ class Factory
* @param \IPLib\Address\AddressInterface $to
*
* @return \IPLib\Range\RangeInterface|null
+ *
+ * @since 1.2.0
*/
protected static function rangeFromBoundaryAddresses(AddressInterface $from = null, AddressInterface $to = null)
{
@@ -163,7 +256,7 @@ class Factory
break;
}
}
- $result = static::rangeFromString($from->toString(true) . '/' . (string) $sameBits);
+ $result = static::parseRangeString($from->toString() . '/' . (string) $sameBits);
}
}
}
@@ -174,11 +267,11 @@ class Factory
/**
* @param string|\IPLib\Address\AddressInterface $from
* @param string|\IPLib\Address\AddressInterface $to
- * @param bool $supportNonDecimalIPv4
+ * @param int $flags
*
* @return \IPLib\Address\AddressInterface[]|null[]|false[]
*/
- private static function parseBoundaries($from, $to, $supportNonDecimalIPv4 = false)
+ private static function parseBoundaries($from, $to, $flags = 0)
{
$result = array();
foreach (array('from', 'to') as $param) {
@@ -188,7 +281,7 @@ class Factory
if ($value === '') {
$value = null;
} else {
- $value = static::addressFromString($value, true, true, $supportNonDecimalIPv4);
+ $value = static::parseAddressString($value, $flags);
if ($value === null) {
$value = false;
}
diff --git a/vendor/mlocati/ip-lib/src/ParseStringFlag.php b/vendor/mlocati/ip-lib/src/ParseStringFlag.php
new file mode 100644
index 00000000..860256e7
--- /dev/null
+++ b/vendor/mlocati/ip-lib/src/ParseStringFlag.php
@@ -0,0 +1,79 @@
+ 5.0.0.1
+ * @example 5.256 => 5.0.1.0
+ * @example 5.0.256 => 5.0.1.0
+ * @example 123456789 => 7.91.205.21
+ */
+ const IPV4_MAYBE_NON_DECIMAL = 4;
+
+ /**
+ * Use this flag if IPv4 subnet ranges may be in compact form.
+ *
+ * @example 127/24 => 127.0.0.0/24
+ * @example 10/8 => 10.0.0.0/8
+ * @example 10/24 => 10.0.0.0/24
+ * @example 10.10.10/24 => 10.10.10.0/24
+ *
+ * @var int
+ */
+ const IPV4SUBNET_MAYBE_COMPACT = 8;
+
+ /**
+ * Use this flag if IPv4 addresses may be in non quad-dotted notation.
+ * This notation is accepted by the implementation of inet_aton and inet_addr of the libc implementation of GNU, Windows and Mac (but not Musl), but not by inet_pton and ip2long.
+ *
+ * @var int
+ *
+ * @example 5.1 => 5.0.0.1
+ * @example 5.256 => 5.0.1.0
+ * @example 5.0.256 => 5.0.1.0
+ * @example 123456789 => 7.91.205.21
+ *
+ * @see https://man7.org/linux/man-pages/man3/inet_addr.3.html#DESCRIPTION
+ * @see https://www.freebsd.org/cgi/man.cgi?query=inet_net&sektion=3&apropos=0&manpath=FreeBSD+12.2-RELEASE+and+Ports#end
+ * @see http://git.musl-libc.org/cgit/musl/tree/src/network/inet_aton.c?h=v1.2.2
+ */
+ const IPV4ADDRESS_MAYBE_NON_QUAD_DOTTED = 16;
+
+ /**
+ * Use this flag if you want to accept parsing IPv4/IPv6 addresses in Reverse DNS Lookup Address format.
+ *
+ * @var int
+ *
+ * @since 1.18.0
+ *
+ * @example 140.13.12.10.in-addr.arpa => 10.12.13.140
+ * @example b.a.9.8.7.6.5.0.4.0.0.0.3.0.0.0.2.0.0.0.1.0.0.0.0.0.0.0.1.2.3.4.ip6.arpa => 4321:0:1:2:3:4:567:89ab
+ */
+ const ADDRESS_MAYBE_RDNS = 32;
+}
diff --git a/vendor/mlocati/ip-lib/src/Range/AbstractRange.php b/vendor/mlocati/ip-lib/src/Range/AbstractRange.php
index 1da94d00..12204350 100644
--- a/vendor/mlocati/ip-lib/src/Range/AbstractRange.php
+++ b/vendor/mlocati/ip-lib/src/Range/AbstractRange.php
@@ -8,6 +8,9 @@ use IPLib\Address\IPv6;
use IPLib\Address\Type as AddressType;
use IPLib\Factory;
+/**
+ * Base class for range classes.
+ */
abstract class AbstractRange implements RangeInterface
{
/**
@@ -20,7 +23,7 @@ abstract class AbstractRange implements RangeInterface
if ($this->rangeType === null) {
$addressType = $this->getAddressType();
if ($addressType === AddressType::T_IPv6 && Subnet::get6to4()->containsRange($this)) {
- $this->rangeType = Factory::rangeFromBoundaries($this->fromAddress->toIPv4(), $this->toAddress->toIPv4())->getRangeType();
+ $this->rangeType = Factory::getRangeFromBoundaries($this->fromAddress->toIPv4(), $this->toAddress->toIPv4())->getRangeType();
} else {
switch ($addressType) {
case AddressType::T_IPv4:
@@ -48,6 +51,33 @@ abstract class AbstractRange implements RangeInterface
return $this->rangeType === false ? null : $this->rangeType;
}
+ /**
+ * {@inheritdoc}
+ *
+ * @see \IPLib\Range\RangeInterface::getAddressAtOffset()
+ */
+ public function getAddressAtOffset($n)
+ {
+ if (!is_int($n)) {
+ return null;
+ }
+
+ $address = null;
+ if ($n >= 0) {
+ $start = Factory::parseAddressString($this->getComparableStartString());
+ $address = $start->getAddressAtOffset($n);
+ } else {
+ $end = Factory::parseAddressString($this->getComparableEndString());
+ $address = $end->getAddressAtOffset($n + 1);
+ }
+
+ if ($address === null) {
+ return null;
+ }
+
+ return $this->contains($address) ? $address : null;
+ }
+
/**
* {@inheritdoc}
*
diff --git a/vendor/mlocati/ip-lib/src/Range/Pattern.php b/vendor/mlocati/ip-lib/src/Range/Pattern.php
index fc19d1ee..1e180ead 100644
--- a/vendor/mlocati/ip-lib/src/Range/Pattern.php
+++ b/vendor/mlocati/ip-lib/src/Range/Pattern.php
@@ -6,6 +6,7 @@ use IPLib\Address\AddressInterface;
use IPLib\Address\IPv4;
use IPLib\Address\IPv6;
use IPLib\Address\Type as AddressType;
+use IPLib\ParseStringFlag;
/**
* Represents an address range in pattern format (only ending asterisks are supported).
@@ -40,6 +41,8 @@ class Pattern extends AbstractRange
* The type of the range of this IP range.
*
* @var int|false|null false if this range crosses multiple range types, null if yet to be determined
+ *
+ * @since 1.5.0
*/
protected $rangeType;
@@ -67,24 +70,45 @@ class Pattern extends AbstractRange
return $this->toString();
}
+ /**
+ * @deprecated since 1.17.0: use the parseString() method instead.
+ * For upgrading:
+ * - if $supportNonDecimalIPv4 is true, use the ParseStringFlag::IPV4_MAYBE_NON_DECIMAL flag
+ *
+ * @param string|mixed $range
+ * @param bool $supportNonDecimalIPv4
+ *
+ * @return static|null
+ *
+ * @see \IPLib\Range\Pattern::parseString()
+ * @since 1.10.0 added the $supportNonDecimalIPv4 argument
+ */
+ public static function fromString($range, $supportNonDecimalIPv4 = false)
+ {
+ return static::parseString($range, ParseStringFlag::MAY_INCLUDE_PORT | ParseStringFlag::MAY_INCLUDE_ZONEID | ($supportNonDecimalIPv4 ? ParseStringFlag::IPV4_MAYBE_NON_DECIMAL : 0));
+ }
+
/**
* Try get the range instance starting from its string representation.
*
* @param string|mixed $range
- * @param bool $supportNonDecimalIPv4 set to true to support parsing non decimal (that is, octal and hexadecimal) IPv4 addresses
+ * @param int $flags A combination or zero or more flags
*
* @return static|null
+ *
+ * @since 1.17.0
+ * @see \IPLib\ParseStringFlag
*/
- public static function fromString($range, $supportNonDecimalIPv4 = false)
+ public static function parseString($range, $flags = 0)
{
if (!is_string($range) || strpos($range, '*') === false) {
return null;
}
if ($range === '*.*.*.*') {
- return new static(IPv4::fromString('0.0.0.0'), IPv4::fromString('255.255.255.255'), 4);
+ return new static(IPv4::parseString('0.0.0.0'), IPv4::parseString('255.255.255.255'), 4);
}
if ($range === '*:*:*:*:*:*:*:*') {
- return new static(IPv6::fromString('::'), IPv6::fromString('ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff'), 8);
+ return new static(IPv6::parseString('::'), IPv6::parseString('ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff'), 8);
}
$matches = null;
if (strpos($range, '.') !== false && preg_match('/^[^*]+((?:\.\*)+)$/', $range, $matches)) {
@@ -96,7 +120,7 @@ class Pattern extends AbstractRange
$asterisksCount += $missingDots;
}
}
- $fromAddress = IPv4::fromString(str_replace('*', '0', $range), true, $supportNonDecimalIPv4);
+ $fromAddress = IPv4::parseString(str_replace('*', '0', $range), $flags);
if ($fromAddress === null) {
return null;
}
@@ -108,7 +132,7 @@ class Pattern extends AbstractRange
}
if (strpos($range, ':') !== false && preg_match('/^[^*]+((?::\*)+)$/', $range, $matches)) {
$asterisksCount = strlen($matches[1]) >> 1;
- $fromAddress = IPv6::fromString(str_replace('*', '0', $range));
+ $fromAddress = IPv6::parseString(str_replace('*', '0', $range));
if ($fromAddress === null) {
return null;
}
@@ -217,15 +241,11 @@ class Pattern extends AbstractRange
* {@inheritdoc}
*
* @see \IPLib\Range\RangeInterface::asSubnet()
+ * @since 1.8.0
*/
public function asSubnet()
{
- switch ($this->getAddressType()) {
- case AddressType::T_IPv4:
- return new Subnet($this->getStartAddress(), $this->getEndAddress(), 8 * (4 - $this->asterisksCount));
- case AddressType::T_IPv6:
- return new Subnet($this->getStartAddress(), $this->getEndAddress(), 16 * (8 - $this->asterisksCount));
- }
+ return new Subnet($this->getStartAddress(), $this->getEndAddress(), $this->getNetworkPrefix());
}
/**
@@ -272,4 +292,31 @@ class Pattern extends AbstractRange
{
return $this->asterisksCount === 0 ? array($this->getStartAddress()->getReverseDNSLookupName()) : $this->asSubnet()->getReverseDNSLookupName();
}
+
+ /**
+ * {@inheritdoc}
+ *
+ * @see \IPLib\Range\RangeInterface::getSize()
+ */
+ public function getSize()
+ {
+ $fromAddress = $this->fromAddress;
+ $maxPrefix = $fromAddress::getNumberOfBits();
+ $prefix = $this->getNetworkPrefix();
+
+ return pow(2, ($maxPrefix - $prefix));
+ }
+
+ /**
+ * @return float|int
+ */
+ private function getNetworkPrefix()
+ {
+ switch ($this->getAddressType()) {
+ case AddressType::T_IPv4:
+ return 8 * (4 - $this->asterisksCount);
+ case AddressType::T_IPv6:
+ return 16 * (8 - $this->asterisksCount);
+ }
+ }
}
diff --git a/vendor/mlocati/ip-lib/src/Range/RangeInterface.php b/vendor/mlocati/ip-lib/src/Range/RangeInterface.php
index 468df3e4..4d4d8347 100644
--- a/vendor/mlocati/ip-lib/src/Range/RangeInterface.php
+++ b/vendor/mlocati/ip-lib/src/Range/RangeInterface.php
@@ -38,9 +38,26 @@ interface RangeInterface
* Get the type of range of the IP address.
*
* @return int One of the \IPLib\Range\Type::T_... constants
+ *
+ * @since 1.5.0
*/
public function getRangeType();
+ /**
+ * Get the address at a certain offset of this range.
+ *
+ * @param int $n the offset of the address (support negative offset)
+ *
+ * @return \IPLib\Address\AddressInterface|null return NULL if $n is not an integer or if the offset out of range
+ *
+ * @since 1.15.0
+ *
+ * @example passing 256 to the range 127.0.0.0/16 will result in 127.0.1.0
+ * @example passing -1 to the range 127.0.1.0/16 will result in 127.0.255.255
+ * @example passing 256 to the range 127.0.0.0/24 will result in NULL
+ */
+ public function getAddressAtOffset($n);
+
/**
* Check if this range contains an IP address.
*
@@ -56,6 +73,8 @@ interface RangeInterface
* @param \IPLib\Range\RangeInterface $range
*
* @return bool
+ *
+ * @since 1.5.0
*/
public function containsRange(RangeInterface $range);
@@ -63,6 +82,8 @@ interface RangeInterface
* Get the initial address contained in this range.
*
* @return \IPLib\Address\AddressInterface
+ *
+ * @since 1.4.0
*/
public function getStartAddress();
@@ -70,6 +91,8 @@ interface RangeInterface
* Get the final address contained in this range.
*
* @return \IPLib\Address\AddressInterface
+ *
+ * @since 1.4.0
*/
public function getEndAddress();
@@ -91,6 +114,8 @@ interface RangeInterface
* Get the subnet mask representing this range (only for IPv4 ranges).
*
* @return \IPLib\Address\IPv4|null return NULL if the range is an IPv6 range, the subnet mask otherwise
+ *
+ * @since 1.8.0
*/
public function getSubnetMask();
@@ -98,6 +123,8 @@ interface RangeInterface
* Get the subnet/CIDR representation of this range.
*
* @return \IPLib\Range\Subnet
+ *
+ * @since 1.13.0
*/
public function asSubnet();
@@ -105,6 +132,8 @@ interface RangeInterface
* Get the pattern/asterisk representation (if applicable) of this range.
*
* @return \IPLib\Range\Pattern|null return NULL if this range can't be represented by a pattern notation
+ *
+ * @since 1.13.0
*/
public function asPattern();
@@ -113,8 +142,19 @@ interface RangeInterface
*
* @return string[]
*
+ * @since 1.13.0
+ *
* @example for IPv4 it returns something like array('x.x.x.x.in-addr.arpa', 'x.x.x.x.in-addr.arpa') (where the number of 'x.' ranges from 1 to 4)
* @example for IPv6 it returns something like array('x.x.x.x..x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.ip6.arpa', 'x.x.x.x..x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.ip6.arpa') (where the number of 'x.' ranges from 1 to 32)
*/
public function getReverseDNSLookupName();
+
+ /**
+ * Get the count of addresses this IP range contains.
+ *
+ * @return int|float Return float as for huge IPv6 networks, int is not enough
+ *
+ * @since 1.16.0
+ */
+ public function getSize();
}
diff --git a/vendor/mlocati/ip-lib/src/Range/Single.php b/vendor/mlocati/ip-lib/src/Range/Single.php
index 6f088500..ec3531f6 100644
--- a/vendor/mlocati/ip-lib/src/Range/Single.php
+++ b/vendor/mlocati/ip-lib/src/Range/Single.php
@@ -6,6 +6,7 @@ use IPLib\Address\AddressInterface;
use IPLib\Address\IPv4;
use IPLib\Address\Type as AddressType;
use IPLib\Factory;
+use IPLib\ParseStringFlag;
/**
* Represents a single address (eg a range that contains just one address).
@@ -41,17 +42,39 @@ class Single extends AbstractRange
}
/**
- * Try get the range instance starting from its string representation.
+ * @deprecated since 1.17.0: use the parseString() method instead.
+ * For upgrading:
+ * - if $supportNonDecimalIPv4 is true, use the ParseStringFlag::IPV4_MAYBE_NON_DECIMAL flag
*
* @param string|mixed $range
- * @param bool $supportNonDecimalIPv4 set to true to support parsing non decimal (that is, octal and hexadecimal) IPv4 addresses
+ * @param bool $supportNonDecimalIPv4
*
* @return static|null
+ *
+ * @see \IPLib\Range\Single::parseString()
+ * @since 1.10.0 added the $supportNonDecimalIPv4 argument
*/
public static function fromString($range, $supportNonDecimalIPv4 = false)
+ {
+ return static::parseString($range, ParseStringFlag::MAY_INCLUDE_PORT | ParseStringFlag::MAY_INCLUDE_ZONEID | ($supportNonDecimalIPv4 ? ParseStringFlag::IPV4_MAYBE_NON_DECIMAL : 0));
+ }
+
+ /**
+ * Try get the range instance starting from its string representation.
+ *
+ * @param string|mixed $range
+ * @param int $flags A combination or zero or more flags
+ *
+ * @return static|null
+ *
+ * @see \IPLib\ParseStringFlag
+ * @since 1.17.0
+ */
+ public static function parseString($range, $flags = 0)
{
$result = null;
- $address = Factory::addressFromString($range, true, true, $supportNonDecimalIPv4);
+ $flags = (int) $flags;
+ $address = Factory::parseAddressString($range, $flags);
if ($address !== null) {
$result = new static($address);
}
@@ -65,6 +88,8 @@ class Single extends AbstractRange
* @param \IPLib\Address\AddressInterface $address
*
* @return static
+ *
+ * @since 1.2.0
*/
public static function fromAddress(AddressInterface $address)
{
@@ -118,23 +143,6 @@ class Single extends AbstractRange
return $result;
}
- /**
- * {@inheritdoc}
- *
- * @see \IPLib\Range\RangeInterface::containsRange()
- */
- public function containsRange(RangeInterface $range)
- {
- $result = false;
- if ($range->getAddressType() === $this->getAddressType()) {
- if ($range->toString(false) === $this->toString(false)) {
- $result = true;
- }
- }
-
- return $result;
- }
-
/**
* {@inheritdoc}
*
@@ -223,4 +231,14 @@ class Single extends AbstractRange
{
return array($this->getStartAddress()->getReverseDNSLookupName());
}
+
+ /**
+ * {@inheritdoc}
+ *
+ * @see \IPLib\Range\RangeInterface::getSize()
+ */
+ public function getSize()
+ {
+ return 1;
+ }
}
diff --git a/vendor/mlocati/ip-lib/src/Range/Subnet.php b/vendor/mlocati/ip-lib/src/Range/Subnet.php
index 2ce166b7..ea397622 100644
--- a/vendor/mlocati/ip-lib/src/Range/Subnet.php
+++ b/vendor/mlocati/ip-lib/src/Range/Subnet.php
@@ -4,9 +4,9 @@ namespace IPLib\Range;
use IPLib\Address\AddressInterface;
use IPLib\Address\IPv4;
-use IPLib\Address\IPv6;
use IPLib\Address\Type as AddressType;
use IPLib\Factory;
+use IPLib\ParseStringFlag;
/**
* Represents an address range in subnet format (eg CIDR).
@@ -41,6 +41,8 @@ class Subnet extends AbstractRange
* The type of the range of this IP range.
*
* @var int|null
+ *
+ * @since 1.5.0
*/
protected $rangeType;
@@ -77,15 +79,36 @@ class Subnet extends AbstractRange
return $this->toString();
}
+ /**
+ * @deprecated since 1.17.0: use the parseString() method instead.
+ * For upgrading:
+ * - if $supportNonDecimalIPv4 is true, use the ParseStringFlag::IPV4_MAYBE_NON_DECIMAL flag
+ *
+ * @param string|mixed $range
+ * @param bool $supportNonDecimalIPv4
+ *
+ * @return static|null
+ *
+ * @see \IPLib\Range\Subnet::parseString()
+ * @since 1.10.0 added the $supportNonDecimalIPv4 argument
+ */
+ public static function fromString($range, $supportNonDecimalIPv4 = false)
+ {
+ return static::parseString($range, ParseStringFlag::MAY_INCLUDE_PORT | ParseStringFlag::MAY_INCLUDE_ZONEID | ($supportNonDecimalIPv4 ? ParseStringFlag::IPV4_MAYBE_NON_DECIMAL : 0));
+ }
+
/**
* Try get the range instance starting from its string representation.
*
* @param string|mixed $range
- * @param bool $supportNonDecimalIPv4 set to true to support parsing non decimal (that is, octal and hexadecimal) IPv4 addresses
+ * @param int $flags A combination or zero or more flags
*
* @return static|null
+ *
+ * @see \IPLib\ParseStringFlag
+ * @since 1.17.0
*/
- public static function fromString($range, $supportNonDecimalIPv4 = false)
+ public static function parseString($range, $flags = 0)
{
if (!is_string($range)) {
return null;
@@ -94,7 +117,14 @@ class Subnet extends AbstractRange
if (count($parts) !== 2) {
return null;
}
- $address = Factory::addressFromString($parts[0], true, true, $supportNonDecimalIPv4);
+ $flags = (int) $flags;
+ if (strpos($parts[0], ':') === false && $flags & ParseStringFlag::IPV4SUBNET_MAYBE_COMPACT) {
+ $missingDots = 3 - substr_count($parts[0], '.');
+ if ($missingDots > 0) {
+ $parts[0] .= str_repeat('.0', $missingDots);
+ }
+ }
+ $address = Factory::parseAddressString($parts[0], $flags);
if ($address === null) {
return null;
}
@@ -197,9 +227,10 @@ class Subnet extends AbstractRange
}
/**
- * Get the pattern (asterisk) representation (if applicable) of this range.
+ * {@inheritdoc}
*
- * @return \IPLib\Range\Pattern|null return NULL if this range can't be represented by a pattern notation
+ * @see \IPLib\Range\RangeInterface::asPattern()
+ * @since 1.8.0
*/
public function asPattern()
{
@@ -217,11 +248,13 @@ class Subnet extends AbstractRange
* Get the 6to4 address IPv6 address range.
*
* @return self
+ *
+ * @since 1.5.0
*/
public static function get6to4()
{
if (self::$sixToFour === null) {
- self::$sixToFour = self::fromString('2002::/16');
+ self::$sixToFour = self::parseString('2002::/16');
}
return self::$sixToFour;
@@ -231,6 +264,8 @@ class Subnet extends AbstractRange
* Get subnet prefix.
*
* @return int
+ *
+ * @since 1.7.0
*/
public function getNetworkPrefix()
{
@@ -302,4 +337,18 @@ class Subnet extends AbstractRange
return $result;
}
+
+ /**
+ * {@inheritdoc}
+ *
+ * @see \IPLib\Range\RangeInterface::getSize()
+ */
+ public function getSize()
+ {
+ $fromAddress = $this->fromAddress;
+ $maxPrefix = $fromAddress::getNumberOfBits();
+ $prefix = $this->getNetworkPrefix();
+
+ return pow(2, ($maxPrefix - $prefix));
+ }
}
diff --git a/vendor/mlocati/ip-lib/src/Range/Type.php b/vendor/mlocati/ip-lib/src/Range/Type.php
index cfc268b6..b2ba8eb7 100644
--- a/vendor/mlocati/ip-lib/src/Range/Type.php
+++ b/vendor/mlocati/ip-lib/src/Range/Type.php
@@ -102,6 +102,8 @@ class Type
* Carrier-grade NAT address.
*
* @var int
+ *
+ * @since 1.10.0
*/
const T_CGNAT = 14;
diff --git a/vendor/mlocati/ip-lib/src/Service/BinaryMath.php b/vendor/mlocati/ip-lib/src/Service/BinaryMath.php
index ec73c8ab..727fecf9 100644
--- a/vendor/mlocati/ip-lib/src/Service/BinaryMath.php
+++ b/vendor/mlocati/ip-lib/src/Service/BinaryMath.php
@@ -4,6 +4,8 @@ namespace IPLib\Service;
/**
* Helper class to work with unsigned binary integers.
+ *
+ * @internal
*/
class BinaryMath
{
diff --git a/vendor/mlocati/ip-lib/src/Service/RangesFromBounradyCalculator.php b/vendor/mlocati/ip-lib/src/Service/RangesFromBoundaryCalculator.php
similarity index 89%
rename from vendor/mlocati/ip-lib/src/Service/RangesFromBounradyCalculator.php
rename to vendor/mlocati/ip-lib/src/Service/RangesFromBoundaryCalculator.php
index c1d29d6f..7a127e79 100644
--- a/vendor/mlocati/ip-lib/src/Service/RangesFromBounradyCalculator.php
+++ b/vendor/mlocati/ip-lib/src/Service/RangesFromBoundaryCalculator.php
@@ -7,12 +7,14 @@ use IPLib\Factory;
use IPLib\Range\Subnet;
/**
- * Helper class to calculate the subnets describing all (and only all) the addresses between two bouundaries.
+ * Helper class to calculate the subnets describing all (and only all) the addresses between two boundaries.
+ *
+ * @internal
*/
-class RangesFromBounradyCalculator
+class RangesFromBoundaryCalculator
{
/**
- * The BinaryMath instance to be used to perform bitwise poerations.
+ * The BinaryMath instance to be used to perform bitwise operations.
*
* @var \IPLib\Service\BinaryMath
*/
@@ -53,7 +55,7 @@ class RangesFromBounradyCalculator
}
/**
- * Calculate the subnets describing all (and only all) the addresses between two bouundaries.
+ * Calculate the subnets describing all (and only all) the addresses between two boundaries.
*
* @param \IPLib\Address\AddressInterface $from
* @param \IPLib\Address\AddressInterface $to
@@ -154,8 +156,13 @@ class RangesFromBounradyCalculator
*/
private function subnetFromBits($bits, $networkPrefix)
{
- $address = $this->addressFromBits($bits);
+ $startAddress = $this->addressFromBits($bits);
+ $numOnes = $this->numBits - $networkPrefix;
+ if ($numOnes === 0) {
+ return new Subnet($startAddress, $startAddress, $networkPrefix);
+ }
+ $endAddress = $this->addressFromBits(substr($bits, 0, -$numOnes) . str_repeat('1', $numOnes));
- return new Subnet($address, $address, $networkPrefix);
+ return new Subnet($startAddress, $endAddress, $networkPrefix);
}
}
diff --git a/vendor/mlocati/ip-lib/src/Service/UnsignedIntegerMath.php b/vendor/mlocati/ip-lib/src/Service/UnsignedIntegerMath.php
new file mode 100644
index 00000000..3179f746
--- /dev/null
+++ b/vendor/mlocati/ip-lib/src/Service/UnsignedIntegerMath.php
@@ -0,0 +1,171 @@
+getBytesFromDecimal($m[1], $numBytes);
+ }
+ } else {
+ if (preg_match('/^0[Xx]0*([0-9A-Fa-f]+)$/', $value, $m)) {
+ return $this->getBytesFromHexadecimal($m[1], $numBytes);
+ }
+ if (preg_match('/^0+([0-7]*)$/', $value, $m)) {
+ return $this->getBytesFromOctal($m[1], $numBytes);
+ }
+ if (preg_match('/^[1-9][0-9]*$/', $value)) {
+ return $this->getBytesFromDecimal($value, $numBytes);
+ }
+ }
+
+ // Not a valid number
+ return null;
+ }
+
+ /**
+ * @return int
+ */
+ protected function getMaxSignedInt()
+ {
+ return PHP_INT_MAX;
+ }
+
+ /**
+ * @param string $value never zero-length, never extra leading zeroes
+ * @param int $numBytes
+ *
+ * @return int[]|null
+ */
+ private function getBytesFromBits($value, $numBytes)
+ {
+ $valueLength = strlen($value);
+ if ($valueLength > $numBytes << 3) {
+ // overflow
+ return null;
+ }
+ $remainderBits = $valueLength % 8;
+ if ($remainderBits !== 0) {
+ $value = str_pad($value, $valueLength + 8 - $remainderBits, '0', STR_PAD_LEFT);
+ }
+ $bytes = array_map('bindec', str_split($value, 8));
+
+ return array_pad($bytes, -$numBytes, 0);
+ }
+
+ /**
+ * @param string $value may be zero-length, never extra leading zeroes
+ * @param int $numBytes
+ *
+ * @return int[]|null
+ */
+ private function getBytesFromOctal($value, $numBytes)
+ {
+ if ($value === '') {
+ return array_fill(0, $numBytes, 0);
+ }
+ $bits = implode(
+ '',
+ array_map(
+ function ($octalDigit) {
+ return str_pad(decbin(octdec($octalDigit)), 3, '0', STR_PAD_LEFT);
+ },
+ str_split($value, 1)
+ )
+ );
+ $bits = ltrim($bits, '0');
+
+ return $bits === '' ? array_fill(0, $numBytes, 0) : static::getBytesFromBits($bits, $numBytes);
+ }
+
+ /**
+ * @param string $value never zero-length, never extra leading zeroes
+ * @param int $numBytes
+ *
+ * @return int[]|null
+ */
+ private function getBytesFromDecimal($value, $numBytes)
+ {
+ $valueLength = strlen($value);
+ $maxSignedIntLength = strlen((string) $this->getMaxSignedInt());
+ if ($valueLength < $maxSignedIntLength) {
+ return $this->getBytesFromBits(decbin((int) $value), $numBytes);
+ }
+ // Divide by two, so that we have 1 less bit
+ $carry = 0;
+ $halfValue = ltrim(
+ implode(
+ '',
+ array_map(
+ function ($digit) use (&$carry) {
+ $number = $carry + (int) $digit;
+ $carry = ($number % 2) * 10;
+
+ return (string) $number >> 1;
+ },
+ str_split($value, 1)
+ )
+ ),
+ '0'
+ );
+ $halfValueBytes = $this->getBytesFromDecimal($halfValue, $numBytes);
+ if ($halfValueBytes === null) {
+ return null;
+ }
+ $carry = $carry === 0 ? 0 : 1;
+ $result = array_fill(0, $numBytes, 0);
+ for ($index = $numBytes - 1; $index >= 0; $index--) {
+ $byte = $carry + ($halfValueBytes[$index] << 1);
+ if ($byte <= 0xFF) {
+ $carry = 0;
+ } else {
+ $carry = ($byte & ~0xFF) >> 8;
+ $byte -= 0x100;
+ }
+ $result[$index] = $byte;
+ }
+ if ($carry !== 0) {
+ // Overflow
+ return null;
+ }
+
+ return $result;
+ }
+
+ /**
+ * @param string $value never zero-length, never extra leading zeroes
+ * @param int $numBytes
+ *
+ * @return int[]|null
+ */
+ private function getBytesFromHexadecimal($value, $numBytes)
+ {
+ $valueLength = strlen($value);
+ if ($valueLength > $numBytes << 1) {
+ // overflow
+ return null;
+ }
+ $value = str_pad($value, $valueLength + $valueLength % 2, '0', STR_PAD_LEFT);
+ $bytes = array_map('hexdec', str_split($value, 2));
+
+ return array_pad($bytes, -$numBytes, 0);
+ }
+}
diff --git a/vendor/paragonie/random_compat/lib/random.php b/vendor/paragonie/random_compat/lib/random.php
index 6df1cb0c..9429ec30 100644
--- a/vendor/paragonie/random_compat/lib/random.php
+++ b/vendor/paragonie/random_compat/lib/random.php
@@ -183,7 +183,7 @@ if (!is_callable('random_bytes')) {
try {
$RandomCompatCOMtest = new COM('CAPICOM.Utilities.1');
/** @psalm-suppress TypeDoesNotContainType */
- if (method_exists($RandomCompatCOMtest, 'GetRandom')) {
+ if (is_callable(array($RandomCompatCOMtest, 'GetRandom'))) {
// See random_bytes_com_dotnet.php
require_once $RandomCompatDIR.DIRECTORY_SEPARATOR.'random_bytes_com_dotnet.php';
}