uetchy/namae
1
0
Fork 0
mirror of https://github.com/uetchy/namae.git synced 2025-07-01 22:10:04 +09:00
Code Issues Releases Activity

fix: properly validate URL

Browse Source
This commit is contained in:
uetchy 2020-06-11 22:00:16 +09:00
parent b8ce81b276
commit 4232d0435d
11 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/package.json
View File

@ -10,6 +10,7 @@
"dependencies": {
"node-fetch": "^2.6.0",
"npm-name": "^6.0.0",
"validator": "^13.1.0",
"whois-json": "^2.0.4"
},
"devDependencies": {

9
api/services/existence.ts
View File

@ -1,3 +1,4 @@
import isURL from 'validator/lib/isURL';
import {send, sendError, fetch, NowRequest, NowResponse} from '../util/http';
export default async function handler(
@ -10,12 +11,8 @@ export default async function handler(
return sendError(res, new Error('no query given'));
}
if (
!/^[(http(s)?)://(www.)?a-zA-Z0-9@:%._+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_+.~#?&//=]*)$/.test(
query,
)
) {
return sendError(res, new Error('Invalid characters'));
if (!isURL(query)) {
return sendError(res, new Error('Invalid URL: ' + query));
}
try {

4
web/src/components/cards/index.tsx
View File

@ -21,7 +21,7 @@ import JsOrgCard from './providers/JsOrg';
import GithubSearchCard from './providers/GitHubSearch';
import AppStoreCard from './providers/AppStore';
import HerokuCard from './providers/Heroku';
import NowCard from './providers/Now';
import VercelCard from './providers/Vercel';
import NtaCard from './providers/Nta';
import NetlifyCard from './providers/Netlify';
import OcamlCard from './providers/Ocaml';
@ -45,7 +45,7 @@ const Index: React.FC<{query: string}> = ({query}) => {
<RubyGemsCard query={query} />
<LinuxCard query={query} />
<OcamlCard query={query} />
<NowCard query={query} />
<VercelCard query={query} />
<HerokuCard query={query} />
<NetlifyCard query={query} />
<JsOrgCard query={query} />

6
web/src/components/cards/providers/Domains.tsx
View File

@ -7,7 +7,11 @@ import {zones} from '../../../util/zones';
const DomainCard: React.FC<{query: string}> = ({query}) => {
const {t} = useTranslation();
const lowerCase = query.toLowerCase();
const sanitizedQuery = query
.replace(/[^0-9a-zA-Z_-]/g, '')
.replace(/_/g, '-');
const lowerCase = sanitizedQuery.toLowerCase();
const domainHackSuggestions = zones
.map((zone) => new RegExp(`${zone}$`).exec(lowerCase.slice(1)))

6
web/src/components/cards/providers/Heroku.tsx
View File

@ -6,7 +6,11 @@ import {Card, Repeater, DedicatedAvailability} from '../core';
const HerokuCard: React.FC<{query: string}> = ({query}) => {
const {t} = useTranslation();
const lowerCase = query.toLowerCase();
const sanitizedQuery = query
.replace(/[^0-9a-zA-Z_-]/g, '')
.replace(/_/g, '-');
const lowerCase = sanitizedQuery.toLowerCase();
const names = [lowerCase];

6
web/src/components/cards/providers/JsOrg.tsx
View File

@ -6,7 +6,11 @@ import {Card, Repeater, DedicatedAvailability} from '../core';
const JsOrgCard: React.FC<{query: string}> = ({query}) => {
const {t} = useTranslation();
const lowerCase = query.toLowerCase();
const sanitizedQuery = query
.replace(/[^0-9a-zA-Z_-]/g, '')
.replace(/_/g, '-');
const lowerCase = sanitizedQuery.toLowerCase();
const names = [lowerCase];

6
web/src/components/cards/providers/Netlify.tsx
View File

@ -6,7 +6,11 @@ import {Card, Repeater, DedicatedAvailability} from '../core';
const NetlifyCard: React.FC<{query: string}> = ({query}) => {
const {t} = useTranslation();
const lowerCase = query.toLowerCase();
const sanitizedQuery = query
.replace(/[^0-9a-zA-Z_-]/g, '')
.replace(/_/g, '-');
const lowerCase = sanitizedQuery.toLowerCase();
const names = [lowerCase];

4
web/src/components/cards/providers/Npm.tsx
View File

@ -19,8 +19,8 @@ const NpmCard: React.FC<{query: string}> = ({query}) => {
<DedicatedAvailability
name={name}
service="npm"
message="Read publishing guide"
link="https://docs.npmjs.com/packages-and-modules/contributing-packages-to-the-registry"
message={`See ${name}`}
link={`https://www.npmjs.com/package/${name}`}
messageIfTaken={`See ${name}`}
linkIfTaken={`https://www.npmjs.com/package/${name}`}
icon={<FaNpm />}

6
web/src/components/cards/providers/S3.tsx
View File

@ -6,7 +6,11 @@ import {Card, DedicatedAvailability, Repeater} from '../core';
const S3Card: React.FC<{query: string}> = ({query}) => {
const {t} = useTranslation();
const lowerCase = query.toLowerCase();
const sanitizedQuery = query
.replace(/[^0-9a-zA-Z_-]/g, '')
.replace(/_/g, '-');
const lowerCase = sanitizedQuery.toLowerCase();
const names = [lowerCase];

6
web/src/components/cards/providers/Slack.tsx
View File

@ -6,7 +6,11 @@ import {Card, DedicatedAvailability, Repeater} from '../core';
const SlackCard: React.FC<{query: string}> = ({query}) => {
const {t} = useTranslation();
const lowerCase = query.toLowerCase();
const sanitizedQuery = query
.replace(/[^0-9a-zA-Z_-]/g, '')
.replace(/_/g, '-');
const lowerCase = sanitizedQuery.toLowerCase();
const names = [lowerCase];

10
web/src/components/cards/providers/Now.tsx → web/src/components/cards/providers/Vercel.tsx
View File

@ -4,9 +4,13 @@ import {NowIcon} from '../../Icons';
import {Card, Repeater, DedicatedAvailability} from '../core';
const NowCard: React.FC<{query: string}> = ({query}) => {
const VercelCard: React.FC<{query: string}> = ({query}) => {
const {t} = useTranslation();
const lowerCase = query.toLowerCase();
const sanitizedQuery = query
.replace(/[^0-9a-zA-Z_-]/g, '')
.replace(/_/g, '-');
const lowerCase = sanitizedQuery.toLowerCase();
const names = [lowerCase];
@ -27,4 +31,4 @@ const NowCard: React.FC<{query: string}> = ({query}) => {
);
};
export default NowCard;
export default VercelCard;