bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-20 10:13:31 +00:00
Code Issues Releases Wiki Activity

[PM-16838] Forbid imports containing /src/ (#12744)

Browse Source 
Forbids bad imports containing /src/.
This commit is contained in:
Oscar Hinton
2025-01-10 16:37:34 +01:00
committed by GitHub
parent fa61928daf
commit db84ccf935
89 changed files with 406 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libs/key-management/src/abstractions/key.service.ts
View File

@@ -5,13 +5,29 @@ import { Observable } from "rxjs";
import { EncryptedOrganizationKeyData } from "@bitwarden/common/admin-console/models/data/encrypted-organization-key.data";
import { KdfConfig } from "@bitwarden/key-management";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { ProfileOrganizationResponse } from "../../../common/src/admin-console/models/response/profile-organization.response";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { ProfileProviderOrganizationResponse } from "../../../common/src/admin-console/models/response/profile-provider-organization.response";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { ProfileProviderResponse } from "../../../common/src/admin-console/models/response/profile-provider.response";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { KeySuffixOptions, HashPurpose } from "../../../common/src/platform/enums";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { EncryptedString, EncString } from "../../../common/src/platform/models/domain/enc-string";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { SymmetricCryptoKey } from "../../../common/src/platform/models/domain/symmetric-crypto-key";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { OrganizationId, UserId } from "../../../common/src/types/guid";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import {
UserKey,
MasterKey,

6
libs/key-management/src/biometrics/biometric-state.service.ts
View File

@@ -2,8 +2,14 @@
// @ts-strict-ignore
import { Observable, firstValueFrom, map, combineLatest } from "rxjs";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { EncryptedString, EncString } from "../../../common/src/platform/models/domain/enc-string";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { ActiveUserState, GlobalState, StateProvider } from "../../../common/src/platform/state";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { UserId } from "../../../common/src/types/guid";
import {

6
libs/key-management/src/biometrics/biometric.state.ts
View File

@@ -1,9 +1,15 @@
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { EncryptedString } from "../../../common/src/platform/models/domain/enc-string";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import {
KeyDefinition,
BIOMETRIC_SETTINGS_DISK,
UserKeyDefinition,
} from "../../../common/src/platform/state";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { UserId } from "../../../common/src/types/guid";
/**

4
libs/key-management/src/kdf-config.service.spec.ts
View File

@@ -3,8 +3,12 @@ import {
FakeStateProvider,
mockAccountServiceWith,
} from "@bitwarden/common/spec";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { UserId } from "@bitwarden/common/src/types/guid";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { Utils } from "../../common/src/platform/misc/utils";
import { DefaultKdfConfigService } from "./kdf-config.service";

4
libs/key-management/src/kdf-config.service.ts
View File

@@ -2,8 +2,12 @@
// @ts-strict-ignore
import { firstValueFrom, Observable } from "rxjs";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { UserId } from "@bitwarden/common/src/types/guid";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { KDF_CONFIG_DISK, StateProvider, UserKeyDefinition } from "../../common/src/platform/state";
import { KdfConfigService } from "./abstractions/kdf-config.service";

42
libs/key-management/src/key.service.spec.ts
View File

@@ -3,6 +3,8 @@ import { bufferCount, firstValueFrom, lastValueFrom, of, take, tap } from "rxjs"
import { EncryptedOrganizationKeyData } from "@bitwarden/common/admin-console/models/data/encrypted-organization-key.data";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { PinServiceAbstraction } from "../../auth/src/common/abstractions";
import {
awaitAsync,
@@ -13,29 +15,69 @@ import {
import { FakeAccountService, mockAccountServiceWith } from "../../common/spec/fake-account-service";
import { FakeActiveUserState, FakeSingleUserState } from "../../common/spec/fake-state";
import { FakeStateProvider } from "../../common/spec/fake-state-provider";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { FakeMasterPasswordService } from "../../common/src/auth/services/master-password/fake-master-password.service";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { CryptoFunctionService } from "../../common/src/platform/abstractions/crypto-function.service";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { EncryptService } from "../../common/src/platform/abstractions/encrypt.service";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { KeyGenerationService } from "../../common/src/platform/abstractions/key-generation.service";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { LogService } from "../../common/src/platform/abstractions/log.service";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { PlatformUtilsService } from "../../common/src/platform/abstractions/platform-utils.service";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { StateService } from "../../common/src/platform/abstractions/state.service";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { Encrypted } from "../../common/src/platform/interfaces/encrypted";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { Utils } from "../../common/src/platform/misc/utils";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { EncString, EncryptedString } from "../../common/src/platform/models/domain/enc-string";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { SymmetricCryptoKey } from "../../common/src/platform/models/domain/symmetric-crypto-key";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { USER_ENCRYPTED_ORGANIZATION_KEYS } from "../../common/src/platform/services/key-state/org-keys.state";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { USER_ENCRYPTED_PROVIDER_KEYS } from "../../common/src/platform/services/key-state/provider-keys.state";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import {
USER_ENCRYPTED_PRIVATE_KEY,
USER_EVER_HAD_USER_KEY,
USER_KEY,
} from "../../common/src/platform/services/key-state/user-key.state";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { UserKeyDefinition } from "../../common/src/platform/state";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { VAULT_TIMEOUT } from "../../common/src/services/vault-timeout/vault-timeout-settings.state";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { CsprngArray } from "../../common/src/types/csprng";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { OrganizationId, UserId } from "../../common/src/types/guid";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { UserKey, MasterKey } from "../../common/src/types/key";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { VaultTimeoutStringType } from "../../common/src/types/vault-timeout.type";
import { KdfConfigService } from "./abstractions/kdf-config.service";

58
libs/key-management/src/key.service.ts
View File

@@ -12,37 +12,93 @@ import {
switchMap,
} from "rxjs";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { PinServiceAbstraction } from "../../auth/src/common/abstractions";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { EncryptedOrganizationKeyData } from "../../common/src/admin-console/models/data/encrypted-organization-key.data";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { BaseEncryptedOrganizationKey } from "../../common/src/admin-console/models/domain/encrypted-organization-key";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { ProfileOrganizationResponse } from "../../common/src/admin-console/models/response/profile-organization.response";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { ProfileProviderOrganizationResponse } from "../../common/src/admin-console/models/response/profile-provider-organization.response";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { ProfileProviderResponse } from "../../common/src/admin-console/models/response/profile-provider.response";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { AccountService } from "../../common/src/auth/abstractions/account.service";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { InternalMasterPasswordServiceAbstraction } from "../../common/src/auth/abstractions/master-password.service.abstraction";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { CryptoFunctionService } from "../../common/src/platform/abstractions/crypto-function.service";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { EncryptService } from "../../common/src/platform/abstractions/encrypt.service";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { KeyGenerationService } from "../../common/src/platform/abstractions/key-generation.service";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { LogService } from "../../common/src/platform/abstractions/log.service";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { PlatformUtilsService } from "../../common/src/platform/abstractions/platform-utils.service";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { StateService } from "../../common/src/platform/abstractions/state.service";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { KeySuffixOptions, HashPurpose } from "../../common/src/platform/enums";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { convertValues } from "../../common/src/platform/misc/convert-values";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { Utils } from "../../common/src/platform/misc/utils";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { EFFLongWordList } from "../../common/src/platform/misc/wordlist";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { EncString, EncryptedString } from "../../common/src/platform/models/domain/enc-string";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { SymmetricCryptoKey } from "../../common/src/platform/models/domain/symmetric-crypto-key";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { USER_ENCRYPTED_ORGANIZATION_KEYS } from "../../common/src/platform/services/key-state/org-keys.state";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { USER_ENCRYPTED_PROVIDER_KEYS } from "../../common/src/platform/services/key-state/provider-keys.state";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import {
USER_ENCRYPTED_PRIVATE_KEY,
USER_EVER_HAD_USER_KEY,
USER_KEY,
} from "../../common/src/platform/services/key-state/user-key.state";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { ActiveUserState, StateProvider } from "../../common/src/platform/state";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { VAULT_TIMEOUT } from "../../common/src/services/vault-timeout/vault-timeout-settings.state";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { CsprngArray } from "../../common/src/types/csprng";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { OrganizationId, ProviderId, UserId } from "../../common/src/types/guid";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import {
OrgKey,
UserKey,
@@ -52,6 +108,8 @@ import {
UserPrivateKey,
UserPublicKey,
} from "../../common/src/types/key";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { VaultTimeoutStringType } from "../../common/src/types/vault-timeout.type";
import { KdfConfigService } from "./abstractions/kdf-config.service";

2
libs/key-management/src/models/kdf-config.ts
View File

@@ -1,5 +1,7 @@
import { Jsonify } from "type-fest";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { RangeWithDefault } from "../../../common/src/platform/misc/range-with-default";
import { KdfType } from "../enums/kdf-type.enum";