diff options
| author | Gianni Ceccarelli <dakkar@thenautilus.net> | 2024-02-04 11:46:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-04 20:46:28 +0900 |
| commit | bafef1f8b45b5117c4418f68160ea288135571c3 (patch) | |
| tree | f9cc04f687edcb14176e399e80d9942412c064b0 /packages/backend/src/server/api/endpoints/admin | |
| parent | fix(backend): メール配信機能が無効ならばメールを送ること... (diff) | |
| download | sharkey-bafef1f8b45b5117c4418f68160ea288135571c3.tar.gz sharkey-bafef1f8b45b5117c4418f68160ea288135571c3.tar.bz2 sharkey-bafef1f8b45b5117c4418f68160ea288135571c3.zip | |
ignore `instance.actor` when checking if there are local users (#13146)
* ignore `instance.actor` when checking if there are local users
We've seen this happen a few times:
* there was some AP software at $some_domain
* it gets replaced by Misskey
* before the first user can be created, an AP activity comes in
* Misskey resolves the activity
* to do this, it creates the `instance.actor` to sign its request
* now there *is* a local user, so the `meta` endpoint returns
`requireSetup:false`
* the admin is very confused
This commit factors out the check, and doesn't count the
`instance.actor` as a real user.
* autogen bits
Diffstat (limited to 'packages/backend/src/server/api/endpoints/admin')
| -rw-r--r-- | packages/backend/src/server/api/endpoints/admin/accounts/create.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/backend/src/server/api/endpoints/admin/accounts/create.ts b/packages/backend/src/server/api/endpoints/admin/accounts/create.ts index b18a7e0e41..14fd69a1a2 100644 --- a/packages/backend/src/server/api/endpoints/admin/accounts/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/accounts/create.ts @@ -9,6 +9,7 @@ import { Endpoint } from '@/server/api/endpoint-base.js'; import type { UsersRepository } from '@/models/_.js'; import { SignupService } from '@/core/SignupService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; +import { InstanceActorService } from '@/core/InstanceActorService.js'; import { localUsernameSchema, passwordSchema } from '@/models/User.js'; import { DI } from '@/di-symbols.js'; import { Packed } from '@/misc/json-schema.js'; @@ -46,13 +47,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- private userEntityService: UserEntityService, private signupService: SignupService, + private instanceActorService: InstanceActorService, ) { super(meta, paramDef, async (ps, _me, token) => { const me = _me ? await this.usersRepository.findOneByOrFail({ id: _me.id }) : null; - const noUsers = (await this.usersRepository.countBy({ - host: IsNull(), - })) === 0; - if ((!noUsers && !me?.isRoot) || token !== null) throw new Error('access denied'); + const realUsers = await this.instanceActorService.realLocalUsersPresent(); + if ((realUsers && !me?.isRoot) || token !== null) throw new Error('access denied'); const { account, secret } = await this.signupService.signup({ username: ps.username, |