From owner-svn-ports-all@freebsd.org Tue Nov 13 15:00:27 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 286421127BE2; Tue, 13 Nov 2018 15:00:27 +0000 (UTC) (envelope-from olivier@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A590469B5E; Tue, 13 Nov 2018 15:00:26 +0000 (UTC) (envelope-from olivier@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6784811D4A; Tue, 13 Nov 2018 15:00:26 +0000 (UTC) (envelope-from olivier@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wADF0Qr4017222; Tue, 13 Nov 2018 15:00:26 GMT (envelope-from olivier@FreeBSD.org) Received: (from olivier@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wADF0QwL017220; Tue, 13 Nov 2018 15:00:26 GMT (envelope-from olivier@FreeBSD.org) Message-Id: <201811131500.wADF0QwL017220@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olivier set sender to olivier@FreeBSD.org using -f From: Olivier Cochard Date: Tue, 13 Nov 2018 15:00:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484876 - in head/www/shellinabox: . files X-SVN-Group: ports-head X-SVN-Commit-Author: olivier X-SVN-Commit-Paths: in head/www/shellinabox: . files X-SVN-Commit-Revision: 484876 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A590469B5E X-Spamd-Result: default: False [-106.88 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.997,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.77)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.91), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Nov 2018 15:00:27 -0000 Author: olivier Date: Tue Nov 13 15:00:25 2018 New Revision: 484876 URL: https://svnweb.freebsd.org/changeset/ports/484876 Log: Be stricter when matching URLs. Submitted by: gahr Obtained from: https://github.com/shellinabox/shellinabox/pull/448/ Modified: head/www/shellinabox/Makefile head/www/shellinabox/files/patch-shellinabox_vt100.jspp Modified: head/www/shellinabox/Makefile ============================================================================== --- head/www/shellinabox/Makefile Tue Nov 13 14:46:41 2018 (r484875) +++ head/www/shellinabox/Makefile Tue Nov 13 15:00:25 2018 (r484876) @@ -4,7 +4,7 @@ PORTNAME= shellinabox PORTVERSION= 2.20 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MAINTAINER= olivier@FreeBSD.org Modified: head/www/shellinabox/files/patch-shellinabox_vt100.jspp ============================================================================== --- head/www/shellinabox/files/patch-shellinabox_vt100.jspp Tue Nov 13 14:46:41 2018 (r484875) +++ head/www/shellinabox/files/patch-shellinabox_vt100.jspp Tue Nov 13 15:00:25 2018 (r484876) @@ -1,24 +1,22 @@ ---- shellinabox/vt100.jspp.orig 2016-11-09 19:40:33 UTC +--- shellinabox/vt100.jspp.orig 2018-11-13 14:31:22 UTC +++ shellinabox/vt100.jspp -@@ -3937,13 +3937,21 @@ VT100.prototype.csim = function() { - break; - default: - if (this.par[i] >= 30 && this.par[i] <= 37) { -+ // set foreground color, colors 0-7 (ansi) - var fg = this.par[i] - 30; - this.attr = ((this.attr & ~0x0F) | fg) & ~(ATTR_DEF_FG); - this.attrFg = false; - } else if (this.par[i] >= 40 && this.par[i] <= 47) { -+ // set background color, colors 0-7 (ansi) - var bg = this.par[i] - 40; - this.attr = ((this.attr & ~0xF0) | (bg << 4)) & ~(ATTR_DEF_BG); - this.attrBg = false; -+ } else if (this.par[i] >= 90 && this.par[i] <= 97) { -+ // set foreground color, colors 8-15 (aixterm high-intensity) -+ this.attrFg = this.par[i] - 82; -+ } else if (this.par[i] >= 100 && this.par[i] <= 107) { -+ // set background color, colors 8-15 (aixterm high-intensity) -+ this.attrBg = this.par[i] - 92; - } - break; - } +@@ -118,7 +118,8 @@ function VT100(container) { + '(?::[1-9][0-9]*)?' + + + // Path. +- '(?:/(?:(?![/ \u00A0]|[,.)}"\u0027!]+[ \u00A0]|[,.)}"\u0027!]+$).)*)*|' + ++ '(?:/(?:(?![/ \u00A0]|[,.)}"\u0027!]+[ \u00A0]|[,.)}"\u0027!]+$)' + ++ '[-a-zA-Z0-9@:%_\+.~#?&//=])*)*|' + + + (linkifyURLs <= 1 ? '' : + // Also support URLs without a protocol (assume "http"). +@@ -149,7 +150,8 @@ function VT100(container) { + '(?::[1-9][0-9]{0,4})?' + + + // Path. +- '(?:/(?:(?![/ \u00A0]|[,.)}"\u0027!]+[ \u00A0]|[,.)}"\u0027!]+$).)*)*|') + ++ '(?:/(?:(?![/ \u00A0]|[,.)}"\u0027!]+[ \u00A0]|[,.)}"\u0027!]+$)' + ++ '[-a-zA-Z0-9@:%_\+.~#?&//=])*)*|') + + + // In addition, support e-mail address. Optionally, recognize "mailto:" + '(?:mailto:)' + (linkifyURLs <= 1 ? '' : '?') +