graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-30 08:03:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Validate URLs

Browse source
This commit is contained in:
syuilo 2017-01-07 22:12:36 +09:00
parent a8a7ceb891
commit 7e2c866575
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/config.ts
View file

@ -4,6 +4,7 @@
import * as fs from 'fs'; import * as fs from 'fs';
import * as yaml from 'js-yaml'; import * as yaml from 'js-yaml';
import * as isUrl from 'is-url';
/** /**
* ユーザーが設定する必要のある情報 * ユーザーが設定する必要のある情報
@ -72,6 +73,10 @@ export default (path: string) => {
const mixin: Mixin = {} as Mixin; const mixin: Mixin = {} as Mixin;
// Validate URLs
if (!isUrl(config.url)) urlError(config.url);
if (!isUrl(config.secondary_url)) urlError(config.secondary_url);
config.url = normalizeUrl(config.url); config.url = normalizeUrl(config.url);
config.secondary_url = normalizeUrl(config.secondary_url); config.secondary_url = normalizeUrl(config.secondary_url);
@ -93,3 +98,8 @@ export default (path: string) => {
function normalizeUrl(url: string): string { function normalizeUrl(url: string): string {
return url[url.length - 1] === '/' ? url.substr(0, url.length - 1) : url; return url[url.length - 1] === '/' ? url.substr(0, url.length - 1) : url;
} }
function urlError(url: string): void {
console.error(`「${url}」は、正しいURLではありません。先頭に http:// または https:// をつけ忘れてないかなど確認してください。`);
process.exit();
}