|
|
@@ -1,32 +1,39 @@
|
|
|
'use strict';
|
|
|
var common = require('../common');
|
|
|
|
|
|
+function urlStrings(schema, longUrl, shortUrl) {
|
|
|
+ longUrl.schema = schema;
|
|
|
+ shortUrl.schema = schema;
|
|
|
+ let longUrlString = common.urlToString(longUrl),
|
|
|
+ shortUrlString = common.urlToString(shortUrl);
|
|
|
+ // ensure the two random URLs actually are sorted as expected
|
|
|
+ if (longUrlString.length <= shortUrlString.length) {
|
|
|
+ if (longUrlString.length === shortUrlString.length) {
|
|
|
+ longUrl.address.unshift('a');
|
|
|
+ longUrlString = common.urlToString(longUrl);
|
|
|
+ } else {
|
|
|
+ [longUrlString, shortUrlString] = [shortUrlString, longUrlString];
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return [longUrlString, shortUrlString];
|
|
|
+}
|
|
|
+
|
|
|
describe('PasteStatus', function () {
|
|
|
describe('createPasteNotification', function () {
|
|
|
this.timeout(30000);
|
|
|
|
|
|
jsc.property(
|
|
|
'creates a notification after a successfull paste upload',
|
|
|
- common.jscSchemas(),
|
|
|
- jsc.nearray(common.jscA2zString()),
|
|
|
- jsc.array(common.jscQueryString()),
|
|
|
- 'string',
|
|
|
- common.jscSchemas(),
|
|
|
- jsc.nearray(common.jscA2zString()),
|
|
|
- jsc.array(common.jscQueryString()),
|
|
|
- function (
|
|
|
- schema1, address1, query1, fragment1,
|
|
|
- schema2, address2, query2
|
|
|
- ) {
|
|
|
- var expected1 = schema1 + '://' + address1.join('') + '/?' +
|
|
|
- encodeURI(query1.join('').replace(/^&+|&+$/gm,'') + '#' + fragment1),
|
|
|
- expected2 = schema2 + '://' + address2.join('') + '/?' +
|
|
|
- encodeURI(query2.join('').replace(/^&+|&+$/gm,'')),
|
|
|
+ common.jscUrl(),
|
|
|
+ common.jscUrl(false),
|
|
|
+ function (url1, url2) {
|
|
|
+ const expected1 = common.urlToString(url1).replace(/&(gt|lt)$/, '&$1a'),
|
|
|
+ expected2 = common.urlToString(url2).replace(/&(gt|lt)$/, '&$1a'),
|
|
|
clean = jsdom();
|
|
|
$('body').html('<div><div id="deletelink"></div><div id="pastelink"></div></div>');
|
|
|
$.PrivateBin.PasteStatus.init();
|
|
|
$.PrivateBin.PasteStatus.createPasteNotification(expected1, expected2);
|
|
|
- var result1 = $('#pasteurl')[0].href,
|
|
|
+ const result1 = $('#pasteurl')[0].href,
|
|
|
result2 = $('#deletelink a')[0].href;
|
|
|
clean();
|
|
|
return result1 === expected1 && result2 === expected2;
|
|
|
@@ -38,28 +45,26 @@ describe('PasteStatus', function () {
|
|
|
this.timeout(30000);
|
|
|
|
|
|
jsc.property(
|
|
|
- 'extracts and updates URLs found in given response',
|
|
|
- jsc.elements(['http','https']),
|
|
|
+ 'extracts and updates IDN URLs found in given response',
|
|
|
+ common.jscSchemas(false),
|
|
|
'nestring',
|
|
|
- jsc.nearray(common.jscA2zString()),
|
|
|
- jsc.array(common.jscQueryString()),
|
|
|
- jsc.array(common.jscAlnumString()),
|
|
|
- 'string',
|
|
|
- function (schema, domain, tld, query, shortid, fragment) {
|
|
|
- domain = domain.replace(/\P{Letter}|[\u00AA-\u00BA]/gu,'').toLowerCase();
|
|
|
+ common.jscUrl(),
|
|
|
+ function (schema, domain, url) {
|
|
|
+ domain = domain.replace(/\P{Letter}|[\u00AA-\u00BA]/gu, '').toLowerCase();
|
|
|
if (domain.length === 0) {
|
|
|
domain = 'a';
|
|
|
}
|
|
|
- const expected = '.' + tld.join('') + '/' + (query.length > 0 ?
|
|
|
- ('?' + encodeURI(query.join('').replace(/^&+|&+$/gm,'')) +
|
|
|
- shortid.join('')) : '') + (fragment.length > 0 ?
|
|
|
- ('#' + encodeURI(fragment)) : ''),
|
|
|
+ url.schema = schema;
|
|
|
+ url.address.unshift('.');
|
|
|
+ url.address = domain.split('').concat(url.address);
|
|
|
+ const urlString = common.urlToString(url),
|
|
|
+ expected = urlString.substring((schema + '://' + domain).length),
|
|
|
clean = jsdom();
|
|
|
|
|
|
$('body').html('<div><div id="pastelink"></div></div>');
|
|
|
$.PrivateBin.PasteStatus.init();
|
|
|
$.PrivateBin.PasteStatus.createPasteNotification('', '');
|
|
|
- $.PrivateBin.PasteStatus.extractUrl(schema + '://' + domain + expected);
|
|
|
+ $.PrivateBin.PasteStatus.extractUrl(urlString);
|
|
|
|
|
|
const result = $('#pasteurl')[0].href;
|
|
|
clean();
|
|
|
@@ -70,6 +75,102 @@ describe('PasteStatus', function () {
|
|
|
);
|
|
|
}
|
|
|
);
|
|
|
+
|
|
|
+ // YOURLS API samples from: https://yourls.org/readme.html#API;apireturn
|
|
|
+ jsc.property(
|
|
|
+ 'extracts and updates URLs found in YOURLS API JSON response',
|
|
|
+ common.jscSchemas(false),
|
|
|
+ common.jscUrl(),
|
|
|
+ common.jscUrl(false),
|
|
|
+ function (schema, longUrl, shortUrl) {
|
|
|
+ const [longUrlString, shortUrlString] = urlStrings(schema, longUrl, shortUrl),
|
|
|
+ yourlsResponse = {
|
|
|
+ url: {
|
|
|
+ keyword: longUrl.address.join(''),
|
|
|
+ url: longUrlString,
|
|
|
+ title: "example title",
|
|
|
+ date: "2014-10-24 16:01:39",
|
|
|
+ ip: "127.0.0.1"
|
|
|
+ },
|
|
|
+ status: "success",
|
|
|
+ message: longUrlString + " added to database",
|
|
|
+ title: "example title",
|
|
|
+ shorturl: shortUrlString,
|
|
|
+ statusCode: 200
|
|
|
+ },
|
|
|
+ clean = jsdom();
|
|
|
+
|
|
|
+ $('body').html('<div><div id="pastelink"></div></div>');
|
|
|
+ $.PrivateBin.PasteStatus.init();
|
|
|
+ $.PrivateBin.PasteStatus.createPasteNotification('', '');
|
|
|
+ $.PrivateBin.PasteStatus.extractUrl(JSON.stringify(yourlsResponse, undefined, 4));
|
|
|
+
|
|
|
+ const result = $('#pasteurl')[0].href;
|
|
|
+ clean();
|
|
|
+
|
|
|
+ return result === shortUrlString;
|
|
|
+ }
|
|
|
+ );
|
|
|
+ jsc.property(
|
|
|
+ 'extracts and updates URLs found in YOURLS API XML response',
|
|
|
+ common.jscSchemas(false),
|
|
|
+ common.jscUrl(),
|
|
|
+ common.jscUrl(false),
|
|
|
+ function (schema, longUrl, shortUrl) {
|
|
|
+ const [longUrlString, shortUrlString] = urlStrings(schema, longUrl, shortUrl),
|
|
|
+ yourlsResponse = '<result>\n' +
|
|
|
+ ' <keyword>' + longUrl.address.join('') + '</keyword>\n' +
|
|
|
+ ' <shorturl>' + shortUrlString + '</shorturl>\n' +
|
|
|
+ ' <longurl>' + longUrlString + '</longurl>\n' +
|
|
|
+ ' <message>success</message>\n' +
|
|
|
+ ' <statusCode>200</statusCode>\n' +
|
|
|
+ '</result>',
|
|
|
+ clean = jsdom();
|
|
|
+
|
|
|
+ $('body').html('<div><div id="pastelink"></div></div>');
|
|
|
+ $.PrivateBin.PasteStatus.init();
|
|
|
+ $.PrivateBin.PasteStatus.createPasteNotification('', '');
|
|
|
+ $.PrivateBin.PasteStatus.extractUrl(yourlsResponse);
|
|
|
+
|
|
|
+ const result = $('#pasteurl')[0].href;
|
|
|
+ clean();
|
|
|
+
|
|
|
+ return result === shortUrlString;
|
|
|
+ }
|
|
|
+ );
|
|
|
+ jsc.property(
|
|
|
+ 'extracts and updates URLs found in YOURLS proxy HTML response',
|
|
|
+ common.jscSchemas(false),
|
|
|
+ common.jscUrl(),
|
|
|
+ common.jscUrl(false),
|
|
|
+ function (schema, longUrl, shortUrl) {
|
|
|
+ const [longUrlString, shortUrlString] = urlStrings(schema, longUrl, shortUrl),
|
|
|
+ yourlsResponse = '<!DOCTYPE html>\n' +
|
|
|
+ '<html lang="en">\n' +
|
|
|
+ '\t<head>\n' +
|
|
|
+ '\t\t<meta charset="utf-8" />\n' +
|
|
|
+ '\t\t<meta http-equiv="Content-Security-Policy" content="default-src \'none\'; base-uri \'self\'; form-action \'none\'; manifest-src \'self\'; connect-src * blob:; script-src \'self\' \'unsafe-eval\'; style-src \'self\'; font-src \'self\'; frame-ancestors \'none\'; img-src \'self\' data: blob:; media-src blob:; object-src blob:; sandbox allow-same-origin allow-scripts allow-forms allow-popups allow-modals allow-downloads">\n' +
|
|
|
+ '\t\t<meta name="robots" content="noindex" />\n' +
|
|
|
+ '\t\t<meta name="google" content="notranslate">\n' +
|
|
|
+ '\t\t<title>PrivateBin</title>\n' +
|
|
|
+ '\t</head>\n' +
|
|
|
+ '\t<body>\n' +
|
|
|
+ '\t\t<p>Your paste is <a id="pasteurl" href="' + shortUrlString + '">' + shortUrlString + '</a> <span id="copyhint">(Hit [Ctrl]+[c] to copy)</span></p>\n' +
|
|
|
+ '\t</body>\n' +
|
|
|
+ '</html>',
|
|
|
+ clean = jsdom();
|
|
|
+
|
|
|
+ $('body').html('<div><div id="pastelink"></div></div>');
|
|
|
+ $.PrivateBin.PasteStatus.init();
|
|
|
+ $.PrivateBin.PasteStatus.createPasteNotification('', '');
|
|
|
+ $.PrivateBin.PasteStatus.extractUrl(yourlsResponse);
|
|
|
+
|
|
|
+ const result = $('#pasteurl')[0].href;
|
|
|
+ clean();
|
|
|
+
|
|
|
+ return result === shortUrlString;
|
|
|
+ }
|
|
|
+ );
|
|
|
});
|
|
|
|
|
|
describe('showRemainingTime', function () {
|
|
|
@@ -79,18 +180,9 @@ describe('PasteStatus', function () {
|
|
|
'shows burn after reading message or remaining time v1',
|
|
|
'bool',
|
|
|
'nat',
|
|
|
- jsc.nearray(common.jscA2zString()),
|
|
|
- jsc.nearray(common.jscA2zString()),
|
|
|
- jsc.nearray(common.jscQueryString()),
|
|
|
- 'string',
|
|
|
- function (
|
|
|
- burnafterreading, remainingTime,
|
|
|
- schema, address, query, fragment
|
|
|
- ) {
|
|
|
- var clean = jsdom('', {
|
|
|
- url: schema.join('') + '://' + address.join('') +
|
|
|
- '/?' + query.join('') + '#' + fragment
|
|
|
- }),
|
|
|
+ common.jscUrl(),
|
|
|
+ function (burnafterreading, remainingTime, url) {
|
|
|
+ let clean = jsdom('', {url: common.urlToString(url)}),
|
|
|
result;
|
|
|
$('body').html('<div id="remainingtime" class="hidden"></div>');
|
|
|
$.PrivateBin.PasteStatus.init();
|
|
|
@@ -117,18 +209,9 @@ describe('PasteStatus', function () {
|
|
|
'shows burn after reading message or remaining time v2',
|
|
|
'bool',
|
|
|
'nat',
|
|
|
- jsc.nearray(common.jscA2zString()),
|
|
|
- jsc.nearray(common.jscA2zString()),
|
|
|
- jsc.nearray(common.jscQueryString()),
|
|
|
- 'string',
|
|
|
- function (
|
|
|
- burnafterreading, remainingTime,
|
|
|
- schema, address, query, fragment
|
|
|
- ) {
|
|
|
- var clean = jsdom('', {
|
|
|
- url: schema.join('') + '://' + address.join('') +
|
|
|
- '/?' + query.join('') + '#' + fragment
|
|
|
- }),
|
|
|
+ common.jscUrl(),
|
|
|
+ function (burnafterreading, remainingTime, url) {
|
|
|
+ let clean = jsdom('', {url: common.urlToString(url)}),
|
|
|
result;
|
|
|
$('body').html('<div id="remainingtime" class="hidden"></div>');
|
|
|
$.PrivateBin.PasteStatus.init();
|
El RIDO