リレーに不正なURLは追加できないように (#6351)

* リレーに不正なURLは追加できないように

* lint
This commit is contained in:
MeiMei 2020-05-15 20:51:16 +09:00 committed by GitHub
parent c5dd9439d5
commit 538ca2a7c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 0 deletions

View File

@ -64,6 +64,11 @@ export default Vue.extend({
inbox inbox
}).then((relay: any) => { }).then((relay: any) => {
this.refresh(); this.refresh();
}).catch((e: any) => {
this.$root.dialog({
type: 'error',
text: e.message || e
});
}); });
}, },
@ -72,6 +77,11 @@ export default Vue.extend({
inbox inbox
}).then(() => { }).then(() => {
this.refresh(); this.refresh();
}).catch((e: any) => {
this.$root.dialog({
type: 'error',
text: e.message || e
});
}); });
}, },

View File

@ -1,6 +1,7 @@
import $ from 'cafy'; import $ from 'cafy';
import define from '../../../define'; import define from '../../../define';
import { addRelay } from '../../../../../services/relay'; import { addRelay } from '../../../../../services/relay';
import { ApiError } from '../../../error';
export const meta = { export const meta = {
desc: { desc: {
@ -17,8 +18,22 @@ export const meta = {
validator: $.str validator: $.str
}, },
}, },
errors: {
invalidUrl: {
message: 'Invalid URL',
code: 'INVALID_URL',
id: 'fb8c92d3-d4e5-44e7-b3d4-800d5cef8b2c'
},
}
}; };
export default define(meta, async (ps, user) => { export default define(meta, async (ps, user) => {
try {
if (new URL(ps.inbox).protocol !== 'https:') throw 'https only';
} catch {
throw new ApiError(meta.errors.invalidUrl);
}
return await addRelay(ps.inbox); return await addRelay(ps.inbox);
}); });