moon
/
ditto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make OAuth form mostly work

This commit is contained in:
Alex Gleason 2023-04-30 13:28:49 -05:00
parent d860ef7f98
commit 81357fa1e3
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
2 changed files with 89 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/api/oauth.ts
View File

@ -1,22 +1,98 @@
import { validator, z } from '@/deps.ts'; import { validator, z } from '@/deps.ts';
import { AppController } from '@/app.ts';
const createTokenSchema = z.object({ const passwordGrantSchema = z.object({
grant_type: z.literal('password'),
password: z.string(), password: z.string(),
}); });
const codeGrantSchema = z.object({
grant_type: z.literal('authorization_code'),
code: z.string(),
});
const createTokenSchema = z.discriminatedUnion('grant_type', [
passwordGrantSchema,
codeGrantSchema,
]);
const createTokenController = validator('json', (value, c) => { const createTokenController = validator('json', (value, c) => {
const result = createTokenSchema.safeParse(value); const result = createTokenSchema.safeParse(value);
if (result.success) { if (result.success) {
return c.json({ switch (result.data.grant_type) {
access_token: result.data.password, case 'password':
token_type: 'Bearer', return c.json({
scope: 'read write follow push', access_token: result.data.password,
created_at: Math.floor(new Date().getTime() / 1000), token_type: 'Bearer',
}); scope: 'read write follow push',
} else { created_at: Math.floor(new Date().getTime() / 1000),
return c.json({ error: 'Invalid request' }, 400); });
case 'authorization_code':
return c.json({
access_token: result.data.code,
token_type: 'Bearer',
scope: 'read write follow push',
created_at: Math.floor(new Date().getTime() / 1000),
});
}
} }
return c.json({ error: 'Invalid request' }, 400);
}); });
export { createTokenController }; /** Display the OAuth form. */
const oauthController: AppController = (c) => {
const encodedUri = c.req.query('redirect_uri');
if (!encodedUri) {
return c.text('Missing `redirect_uri` query param.', 422);
}
const redirectUri = decodeURIComponent(encodedUri);
// Poor man's XSS check.
// TODO: Render form with JSX.
try {
new URL(redirectUri);
} catch (_e) {
return c.text('Invalid `redirect_uri`.', 422);
}
c.res.headers.set('content-security-policy', 'default-src \'self\'');
// TODO: Login with `window.nostr` (NIP-07).
return c.html(`<!DOCTYPE html>
<html>
<head>
<title>Log in with Ditto</title>
</head>
<body>
<form action="/oauth/authorize" method="post">
<input type="text" placeholder="npub1... or nsec1..." name="nostr_id" autocomplete="off">
<input type="hidden" name="redirect_uri" id="redirect_uri" value="${redirectUri}" autocomplete="off">
<button type="submit">Authorize</button>
</form>
</body>
</html>
`);
};
const oauthAuthorizeController: AppController = async (c) => {
const formData = await c.req.formData();
const nostrId = formData.get('nostr_id');
const redirectUri = formData.get('redirect_uri');
if (nostrId && redirectUri) {
const url = new URL(redirectUri.toString());
const q = new URLSearchParams();
q.set('code', nostrId.toString());
url.search = q.toString();
return c.redirect(url.toString());
}
return c.text('Missing `redirect_uri` or `nostr_id`.', 422);
};
export { createTokenController, oauthAuthorizeController, oauthController };

4
src/app.ts
View File

@ -11,7 +11,7 @@ import { appCredentialsController, createAppController } from './api/apps.ts';
import { emptyArrayController, emptyObjectController } from './api/fallback.ts'; import { emptyArrayController, emptyObjectController } from './api/fallback.ts';
import homeController from './api/home.ts'; import homeController from './api/home.ts';
import instanceController from './api/instance.ts'; import instanceController from './api/instance.ts';
import { createTokenController } from './api/oauth.ts'; import { createTokenController, oauthAuthorizeController, oauthController } from './api/oauth.ts';
import { contextController, createStatusController, statusController } from './api/statuses.ts'; import { contextController, createStatusController, statusController } from './api/statuses.ts';
import { requireAuth, setAuth } from './middleware/auth.ts'; import { requireAuth, setAuth } from './middleware/auth.ts';
@ -37,6 +37,8 @@ app.post('/api/v1/apps', createAppController);
app.post('/oauth/token', createTokenController); app.post('/oauth/token', createTokenController);
app.post('/oauth/revoke', emptyObjectController); app.post('/oauth/revoke', emptyObjectController);
app.post('/oauth/authorize', oauthAuthorizeController);
app.get('/oauth/authorize', oauthController);
app.get('/api/v1/accounts/verify_credentials', requireAuth, credentialsController); app.get('/api/v1/accounts/verify_credentials', requireAuth, credentialsController);
app.get('/api/v1/accounts/search', accountSearchController); app.get('/api/v1/accounts/search', accountSearchController);