mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

Be stricter when matching URLs.

Browse Source 
Submitted by:	gahr
Obtained from:	https://github.com/shellinabox/shellinabox/pull/448/
This commit is contained in:
Olivier Cochard 2018-11-13 15:00:25 +00:00
parent 4f768e4134
commit 4bde7046e7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=484876
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/shellinabox/Makefile
View File

@ -4,7 +4,7 @@
PORTNAME= shellinabox
PORTVERSION= 2.20
DISTVERSIONPREFIX= v
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www
MAINTAINER= olivier@FreeBSD.org

44
www/shellinabox/files/patch-shellinabox_vt100.jspp
View File

@ -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 ? '' : '?') +