cnpmcore 3.6.0 → 3.8.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (26) hide show
  1. package/dist/app/common/PackageUtil.d.ts +1 -0
  2. package/dist/app/common/PackageUtil.js +6 -2
  3. package/dist/app/common/constants.d.ts +4 -0
  4. package/dist/app/common/constants.js +7 -2
  5. package/dist/app/core/entity/User.d.ts +1 -0
  6. package/dist/app/core/entity/User.js +3 -1
  7. package/dist/app/core/service/ChangesStreamService.d.ts +1 -1
  8. package/dist/app/core/service/ChangesStreamService.js +10 -7
  9. package/dist/app/core/service/PackageManagerService.js +4 -8
  10. package/dist/app/core/service/PackageSyncerService.js +5 -15
  11. package/dist/app/core/service/RegistryManagerService.d.ts +1 -0
  12. package/dist/app/core/service/RegistryManagerService.js +19 -2
  13. package/dist/app/port/UserRoleManager.d.ts +2 -0
  14. package/dist/app/port/UserRoleManager.js +52 -23
  15. package/dist/app/port/controller/AbstractController.d.ts +6 -2
  16. package/dist/app/port/controller/AbstractController.js +23 -13
  17. package/dist/app/port/controller/PackageTagController.js +5 -3
  18. package/dist/app/port/controller/UserController.js +2 -2
  19. package/dist/app/port/controller/package/RemovePackageVersionController.js +3 -2
  20. package/dist/app/port/controller/package/SavePackageVersionController.d.ts +2 -1
  21. package/dist/app/port/controller/package/SavePackageVersionController.js +14 -22
  22. package/dist/app/port/controller/package/ShowPackageController.js +2 -2
  23. package/dist/app/port/controller/package/ShowPackageVersionController.js +2 -2
  24. package/dist/app/port/controller/package/UpdatePackageController.js +4 -2
  25. package/dist/app.js +2 -2
  26. package/package.json +1 -1
@@ -275,7 +275,7 @@ let PackageSyncerService = class PackageSyncerService extends AbstractService_1.
275
275
  }
276
276
  // 采用默认的 registry
277
277
  if (!registry) {
278
- registry = await this.registryManagerService.findByRegistryName('default');
278
+ registry = await this.registryManagerService.findByRegistryName(constants_1.PresetRegistryName.default);
279
279
  }
280
280
  // 更新 targetHost 地址
281
281
  // defaultRegistry 可能还未创建
@@ -705,16 +705,10 @@ let PackageSyncerService = class PackageSyncerService extends AbstractService_1.
705
705
  // 4.1 find out remove maintainers
706
706
  const removedMaintainers = [];
707
707
  const existsMaintainers = existsData && existsData.maintainers || [];
708
- let shouldRefreshMaintainers = false;
709
708
  for (const maintainer of existsMaintainers) {
710
- let npmUserName = maintainer.name;
711
- if (npmUserName.startsWith('npm:')) {
712
- // fix cache npm user name
713
- npmUserName = npmUserName.replace('npm:', '');
714
- shouldRefreshMaintainers = true;
715
- }
716
- if (!(npmUserName in maintainersMap)) {
717
- const user = await this.userRepository.findUserByName(`npm:${npmUserName}`);
709
+ const { name } = maintainer;
710
+ if (!(name in maintainersMap)) {
711
+ const user = await this.userRepository.findUserByName(`${registry?.userPrefix || 'npm:'}${name}`);
718
712
  if (user) {
719
713
  await this.packageManagerService.removePackageMaintainer(pkg, user);
720
714
  removedMaintainers.push(maintainer);
@@ -724,10 +718,6 @@ let PackageSyncerService = class PackageSyncerService extends AbstractService_1.
724
718
  if (removedMaintainers.length > 0) {
725
719
  logs.push(`[${isoNow()}] 🟢 Removed ${removedMaintainers.length} maintainers: ${JSON.stringify(removedMaintainers)}`);
726
720
  }
727
- else if (shouldRefreshMaintainers) {
728
- await this.packageManagerService.refreshPackageMaintainersToDists(pkg);
729
- logs.push(`[${isoNow()}] 🟢 Refresh maintainers`);
730
- }
731
721
  // 5. add deps sync task
732
722
  for (const dependencyName of dependenciesSet) {
733
723
  const existsTask = await this.taskRepository.findTaskByTargetName(dependencyName, Task_1.TaskType.SyncPackage, Task_1.TaskState.Waiting);
@@ -816,4 +806,4 @@ PackageSyncerService = __decorate([
816
806
  })
817
807
  ], PackageSyncerService);
818
808
  exports.PackageSyncerService = PackageSyncerService;
819
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageSyncerService.js","sourceRoot":"","sources":["../../../../app/core/service/PackageSyncerService.ts"],"names":[],"mappings":"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"}
809
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageSyncerService.js","sourceRoot":"","sources":["../../../../app/core/service/PackageSyncerService.ts"],"names":[],"mappings":"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"}
@@ -26,4 +26,5 @@ export declare class RegistryManagerService extends AbstractService {
26
26
  findByRegistryId(registryId: string): Promise<Registry | null>;
27
27
  findByRegistryName(registryName?: string): Promise<Registry | null>;
28
28
  remove(removeCmd: RemoveRegistryCmd): Promise<void>;
29
+ ensureSelfRegistry(): Promise<Registry>;
29
30
  }
@@ -18,6 +18,8 @@ const Registry_1 = require("../entity/Registry");
18
18
  const ScopeManagerService_1 = require("./ScopeManagerService");
19
19
  const TaskService_1 = require("./TaskService");
20
20
  const Task_1 = require("../entity/Task");
21
+ const constants_1 = require("../../common/constants");
22
+ const Registry_2 = require("../../common/enum/Registry");
21
23
  let RegistryManagerService = class RegistryManagerService extends AbstractService_1.AbstractService {
22
24
  async createSyncChangesStream(startSyncCmd) {
23
25
  const { registryId, operatorId = '-', since } = startSyncCmd;
@@ -36,7 +38,7 @@ let RegistryManagerService = class RegistryManagerService extends AbstractServic
36
38
  await this.taskService.createTask(Task_1.Task.createChangesStream(targetName, registryId, since), false);
37
39
  }
38
40
  async createRegistry(createCmd) {
39
- const { name, changeStream, host, userPrefix, type, operatorId = '-' } = createCmd;
41
+ const { name, changeStream = '', host, userPrefix = '', type, operatorId = '-' } = createCmd;
40
42
  this.logger.info('[RegistryManagerService.createRegistry:prepare] operatorId: %s, createCmd: %j', operatorId, createCmd);
41
43
  const registry = Registry_1.Registry.create({
42
44
  name,
@@ -84,6 +86,21 @@ let RegistryManagerService = class RegistryManagerService extends AbstractServic
84
86
  await this.registryRepository.removeRegistry(registryId);
85
87
  await this.scopeManagerService.removeByRegistryId({ registryId, operatorId });
86
88
  }
89
+ async ensureSelfRegistry() {
90
+ const existRegistry = await this.registryRepository.findRegistry(constants_1.PresetRegistryName.self);
91
+ if (existRegistry) {
92
+ return existRegistry;
93
+ }
94
+ const { registry: registryHost } = this.config.cnpmcore;
95
+ const newRegistry = await this.createRegistry({
96
+ name: constants_1.PresetRegistryName.self,
97
+ host: registryHost,
98
+ type: Registry_2.RegistryType.Cnpmcore,
99
+ changeStream: '',
100
+ userPrefix: '',
101
+ });
102
+ return newRegistry;
103
+ }
87
104
  };
88
105
  __decorate([
89
106
  (0, tegg_1.Inject)(),
@@ -103,4 +120,4 @@ RegistryManagerService = __decorate([
103
120
  })
104
121
  ], RegistryManagerService);
105
122
  exports.RegistryManagerService = RegistryManagerService;
106
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVnaXN0cnlNYW5hZ2VyU2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9jb3JlL3NlcnZpY2UvUmVnaXN0cnlNYW5hZ2VyU2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxzQ0FJcUI7QUFDckIsMkNBQWlEO0FBQ2pELDRFQUF5RTtBQUN6RSxrRUFBK0Q7QUFDL0QsaURBQThDO0FBRTlDLCtEQUE0RDtBQUM1RCwrQ0FBNEM7QUFDNUMseUNBQXNDO0FBcUIvQixJQUFNLHNCQUFzQixHQUE1QixNQUFNLHNCQUF1QixTQUFRLGlDQUFlO0lBUXpELEtBQUssQ0FBQyx1QkFBdUIsQ0FBQyxZQUEwQjtRQUN0RCxNQUFNLEVBQUUsVUFBVSxFQUFFLFVBQVUsR0FBRyxHQUFHLEVBQUUsS0FBSyxFQUFFLEdBQUcsWUFBWSxDQUFDO1FBQzdELElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLG1HQUFtRyxFQUFFLFVBQVUsRUFBRSxVQUFVLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDckosTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFJLENBQUMsa0JBQWtCLENBQUMsd0JBQXdCLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDcEYsSUFBSSxDQUFDLFFBQVEsRUFBRTtZQUNiLE1BQU0sSUFBSSwwQkFBYSxDQUFDLFlBQVksVUFBVSxZQUFZLENBQUMsQ0FBQztTQUM3RDtRQUVELDJDQUEyQztRQUMzQyxNQUFNLFdBQVcsR0FBRyxNQUFNLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxpQkFBaUIsQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUNqRixJQUFJLFdBQVcsS0FBSyxDQUFDLEVBQUU7WUFDckIsTUFBTSxJQUFJLGlCQUFJLENBQUMsWUFBWSxVQUFVLDRDQUE0QyxDQUFDLENBQUM7U0FDcEY7UUFFRCxrQkFBa0I7UUFDbEIsTUFBTSxVQUFVLEdBQUcsR0FBRyxRQUFRLENBQUMsSUFBSSxDQUFD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
123
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVnaXN0cnlNYW5hZ2VyU2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9jb3JlL3NlcnZpY2UvUmVnaXN0cnlNYW5hZ2VyU2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxzQ0FJcUI7QUFDckIsMkNBQWlEO0FBQ2pELDRFQUF5RTtBQUN6RSxrRUFBK0Q7QUFDL0QsaURBQThDO0FBRTlDLCtEQUE0RDtBQUM1RCwrQ0FBNEM7QUFDNUMseUNBQXNDO0FBQ3RDLHNEQUE0RDtBQUM1RCx5REFBMEQ7QUFxQm5ELElBQU0sc0JBQXNCLEdBQTVCLE1BQU0sc0JBQXVCLFNBQVEsaUNBQWU7SUFRekQsS0FBSyxDQUFDLHVCQUF1QixDQUFDLFlBQTBCO1FBQ3RELE1BQU0sRUFBRSxVQUFVLEVBQUUsVUFBVSxHQUFHLEdBQUcsRUFBRSxLQUFLLEVBQUUsR0FBRyxZQUFZLENBQUM7UUFDN0QsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsbUdBQW1HLEVBQUUsVUFBVSxFQUFFLFVBQVUsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUNySixNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyx3QkFBd0IsQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUNwRixJQUFJLENBQUMsUUFBUSxFQUFFO1lBQ2IsTUFBTSxJQUFJLDBCQUFhLENBQUMsWUFBWSxVQUFVLFlBQVksQ0FBQyxDQUFDO1NBQzdEO1FBRUQsMkNBQTJDO1FBQzNDLE1BQU0sV0FBVyxHQUFHLE1BQU0sSUFBSSxDQUFDLG1CQUFtQixDQUFDLGlCQUFpQixDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ2pGLElBQUksV0FBVyxLQUFLLENBQUMsRUFBRTtZQUNyQixNQUFNLElBQUksaUJBQUksQ0FBQyxZQUFZLFVBQVUsNENBQTRDLENBQUMsQ0FBQztTQUNwRjtRQUVELGtCQUFrQjtRQUNsQixNQUFNLFVBQVUsR0FB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
@@ -9,9 +9,11 @@ export declare class UserRoleManager {
9
9
  private readonly packageRepository;
10
10
  private readonly config;
11
11
  protected logger: EggLogger;
12
+ private readonly registryManagerService;
12
13
  private handleAuthorized;
13
14
  private currentAuthorizedUser;
14
15
  private currentAuthorizedToken;
16
+ checkPublishAccess(ctx: EggContext, fullname: string): Promise<UserEntity>;
15
17
  getAuthorizedUserAndToken(ctx: EggContext): Promise<{
16
18
  token: TokenEntity;
17
19
  user: UserEntity;
@@ -15,10 +15,48 @@ const egg_errors_1 = require("egg-errors");
15
15
  const UserRepository_1 = require("../repository/UserRepository");
16
16
  const PackageRepository_1 = require("../repository/PackageRepository");
17
17
  const UserUtil_1 = require("../common/UserUtil");
18
+ const PackageUtil_1 = require("../common/PackageUtil");
19
+ const RegistryManagerService_1 = require("../core/service/RegistryManagerService");
18
20
  let UserRoleManager = class UserRoleManager {
19
21
  constructor() {
20
22
  this.handleAuthorized = false;
21
23
  }
24
+ // check publish access
25
+ // 1. admin has all access
26
+ // 2. has published in current registry
27
+ // 3. pkg scope is allowed to publish
28
+ // use AbstractController#ensurePublishAccess ensure pkg exists;
29
+ async checkPublishAccess(ctx, fullname) {
30
+ const user = await this.requiredAuthorizedUser(ctx, 'publish');
31
+ // 1. admin chas all access
32
+ const isAdmin = await this.isAdmin(ctx);
33
+ if (isAdmin) {
34
+ return user;
35
+ }
36
+ // 2. has published in current registry
37
+ const [scope, name] = (0, PackageUtil_1.getScopeAndName)(fullname);
38
+ const pkg = await this.packageRepository.findPackage(scope, name);
39
+ const selfRegistry = await this.registryManagerService.ensureSelfRegistry();
40
+ const inSelfRegistry = pkg?.registryId === selfRegistry.registryId;
41
+ if (inSelfRegistry) {
42
+ // 2.1 check in Maintainers table
43
+ // Higher priority than scope check
44
+ await this.requiredPackageMaintainer(pkg, user);
45
+ return user;
46
+ }
47
+ if (pkg && !scope && !inSelfRegistry) {
48
+ // 2.2 public package can't publish in other registry
49
+ // scope package can be migrated into self registry
50
+ throw new egg_errors_1.ForbiddenError(`Can\'t modify npm public package "${fullname}"`);
51
+ }
52
+ // 3 check scope is allowed to publish
53
+ await this.requiredPackageScope(scope, user);
54
+ if (pkg) {
55
+ // published scoped package
56
+ await this.requiredPackageMaintainer(pkg, user);
57
+ }
58
+ return user;
59
+ }
22
60
  // {
23
61
  // 'user-agent': 'npm/8.1.2 node/v16.13.1 darwin arm64 workspaces/false',
24
62
  // 'npm-command': 'adduser',
@@ -91,20 +129,6 @@ let UserRoleManager = class UserRoleManager {
91
129
  return user;
92
130
  }
93
131
  async requiredPackageMaintainer(pkg, user) {
94
- // should be private package
95
- if (!pkg.isPrivate) {
96
- // admins can modified public package
97
- if (this.config.cnpmcore.admins[user.name]) {
98
- this.logger.warn('[UserRoleManager.requiredPackageMaintainer] admin "%s" modified public package "%s"', user.name, pkg.fullname);
99
- return;
100
- }
101
- throw new egg_errors_1.ForbiddenError(`Can\'t modify npm public package "${pkg.fullname}"`);
102
- }
103
- // admins can modified private package (publish to cnpmcore)
104
- if (pkg.isPrivate && this.config.cnpmcore.admins[user.name] === user.email) {
105
- this.logger.warn('[UserRoleManager.requiredPackageMaintainer] admin "%s" modified private package "%s"', user.name, pkg.fullname);
106
- return;
107
- }
108
132
  const maintainers = await this.packageRepository.listPackageMaintainers(pkg.packageId);
109
133
  const maintainer = maintainers.find(m => m.userId === user.userId);
110
134
  if (!maintainer) {
@@ -114,14 +138,15 @@ let UserRoleManager = class UserRoleManager {
114
138
  }
115
139
  async requiredPackageScope(scope, user) {
116
140
  const cnpmcoreConfig = this.config.cnpmcore;
117
- if (!cnpmcoreConfig.allowPublishNonScopePackage) {
118
- const allowScopes = user.scopes ?? cnpmcoreConfig.allowScopes;
119
- if (!scope) {
120
- throw new egg_errors_1.ForbiddenError(`Package scope required, legal scopes: "${allowScopes.join(', ')}"`);
121
- }
122
- if (!allowScopes.includes(scope)) {
123
- throw new egg_errors_1.ForbiddenError(`Scope "${scope}" not match legal scopes: "${allowScopes.join(', ')}"`);
124
- }
141
+ if (cnpmcoreConfig.allowPublishNonScopePackage) {
142
+ return;
143
+ }
144
+ const allowScopes = user.scopes ?? cnpmcoreConfig.allowScopes;
145
+ if (!scope) {
146
+ throw new egg_errors_1.ForbiddenError(`Package scope required, legal scopes: "${allowScopes.join(', ')}"`);
147
+ }
148
+ if (!allowScopes.includes(scope)) {
149
+ throw new egg_errors_1.ForbiddenError(`Scope "${scope}" not match legal scopes: "${allowScopes.join(', ')}"`);
125
150
  }
126
151
  }
127
152
  async isAdmin(ctx) {
@@ -150,6 +175,10 @@ __decorate([
150
175
  (0, tegg_1.Inject)(),
151
176
  __metadata("design:type", Object)
152
177
  ], UserRoleManager.prototype, "logger", void 0);
178
+ __decorate([
179
+ (0, tegg_1.Inject)(),
180
+ __metadata("design:type", RegistryManagerService_1.RegistryManagerService)
181
+ ], UserRoleManager.prototype, "registryManagerService", void 0);
153
182
  UserRoleManager = __decorate([
154
183
  (0, tegg_1.ContextProto)({
155
184
  // only inject on port module
@@ -157,4 +186,4 @@ UserRoleManager = __decorate([
157
186
  })
158
187
  ], UserRoleManager);
159
188
  exports.UserRoleManager = UserRoleManager;
160
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlclJvbGVNYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vYXBwL3BvcnQvVXNlclJvbGVNYW5hZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLHNDQUtxQjtBQUVyQiwyQ0FBK0Q7QUFDL0QsaUVBQThEO0FBQzlELHVFQUFvRTtBQUlwRSxpREFBNEM7QUFTckMsSUFBTSxlQUFlLEdBQXJCLE1BQU0sZUFBZTtJQUFyQjtRQVVHLHFCQUFnQixHQUFHLEtBQUssQ0FBQztJQTBIbkMsQ0FBQztJQXRIQyxJQUFJO0lBQ0osMkVBQTJFO0lBQzNFLDhCQUE4QjtJQUM5QixrRUFBa0U7SUFDbEUsd0NBQXdDO0lBQ3hDLG1CQUFtQjtJQUNuQiw2QkFBNkI7SUFDN0IsdUNBQXVDO0lBQ3ZDLDRCQUE0QjtJQUM1Qiw2QkFBNkI7SUFDN0IsSUFBSTtJQUNHLEtBQUssQ0FBQyx5QkFBeUIsQ0FBQyxHQUFlO1FBQ3BELElBQUksSUFBSSxDQUFDLGdCQUFnQixFQUFFO1lBQ3pCLElBQUksQ0FBQyxJQUFJLENBQUMscUJBQXFCO2dCQUFFLE9BQU8sSUFBSSxDQUFDO1lBQzdDLE9BQU87Z0JBQ0wsS0FBSyxFQUFFLElBQUksQ0FBQyxzQkFBc0I7Z0JBQ2xDLElBQUksRUFBRSxJQUFJLENBQUMscUJBQXFCO2FBQ2pDLENBQUM7U0FDSDtRQUVELElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxJQUFJLENBQUM7UUFDN0IsTUFBTSxhQUFhLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQztRQUMvQyxJQUFJLENBQUMsYUFBYTtZQUFFLE9BQU8sSUFBSSxDQUFDO1FBQ2hDLE1BQU0sTUFBTSxHQUFHLHFCQUFxQixDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUN6RCxJQUFJLENBQUMsTUFBTTtZQUFFLE9BQU8sSUFBSSxDQUFDO1FBQ3pCLE1BQU0sVUFBVSxHQUFHLE1BQU0sQ0FBQyxD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
189
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlclJvbGVNYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vYXBwL3BvcnQvVXNlclJvbGVNYW5hZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLHNDQUtxQjtBQUVyQiwyQ0FBK0Q7QUFDL0QsaUVBQThEO0FBQzlELHVFQUFvRTtBQUlwRSxpREFBNEM7QUFDNUMsdURBQXdEO0FBQ3hELG1GQUFnRjtBQVN6RSxJQUFNLGVBQWUsR0FBckIsTUFBTSxlQUFlO0lBQXJCO1FBWUcscUJBQWdCLEdBQUcsS0FBSyxDQUFDO0lBcUpuQyxDQUFDO0lBakpDLHVCQUF1QjtJQUN2QiwwQkFBMEI7SUFDMUIsdUNBQXVDO0lBQ3ZDLHFDQUFxQztJQUNyQyxnRUFBZ0U7SUFDekQsS0FBSyxDQUFDLGtCQUFrQixDQUFDLEdBQWUsRUFBRSxRQUFnQjtRQUUvRCxNQUFNLElBQUksR0FBRyxNQUFNLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxHQUFHLEVBQUUsU0FBUyxDQUFDLENBQUM7UUFFL0QsMkJBQTJCO1FBQzNCLE1BQU0sT0FBTyxHQUFHLE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUN4QyxJQUFJLE9BQU8sRUFBRTtZQUNYLE9BQU8sSUFBSSxDQUFDO1NBQ2I7UUFFRCx1Q0FBdUM7UUFDdkMsTUFBTSxDQUFFLEtBQUssRUFBRSxJQUFJLENBQUUsR0FBRyxJQUFBLDZCQUFlLEVBQUMsUUFBUSxDQUFDLENBQUM7UUFDbEQsTUFBTSxHQUFHLEdBQUcsTUFBTSxJQUFJLENBQUMsaUJBQWlCLENBQUMsV0FBVyxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsQ0FBQztRQUNsRSxNQUFNLFlBQVksR0FBRyxNQUFNLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxrQkFBa0IsRUFBRSxDQUFDO1FBQzVFLE1BQU0sY0FBYyxHQUFHLEdBQUcsRUFBRSxVQUFVLEtBQUssWUFBWSxDQUFDLFVBQVUs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
@@ -20,13 +20,17 @@ export declare abstract class AbstractController extends MiddlewareController {
20
20
  protected get sourceRegistry(): string;
21
21
  protected get enableSync(): boolean;
22
22
  protected isPrivateScope(scope: string): any;
23
+ protected ensurePublishAccess(ctx: EggContext, fullname: string, checkPkgExist?: boolean): Promise<{
24
+ pkg: PackageEntity | null;
25
+ user: import("../../core/entity/User").User;
26
+ }>;
23
27
  protected get syncNotFound(): any;
24
28
  protected get redirectNotFound(): any;
25
29
  protected getAllowSync(ctx: EggContext): boolean;
26
- protected createPackageNotFoundError(fullname: string, version?: string, allowSync?: boolean): PackageNotFoundError;
30
+ protected createPackageNotFoundError(fullname: string, version?: string): PackageNotFoundError;
31
+ protected createPackageNotFoundErrorWithRedirect(fullname: string, version?: string, allowSync?: boolean): PackageNotFoundError;
27
32
  protected createPackageBlockError(reason: string, fullname: string, version?: string): UnavailableForLegalReasonsError;
28
33
  protected getPackageEntityByFullname(fullname: string): Promise<PackageEntity>;
29
- protected getPackageEntityAndRequiredMaintainer(ctx: EggContext, fullname: string): Promise<PackageEntity>;
30
34
  protected getPackageEntity(scope: string, name: string): Promise<PackageEntity>;
31
35
  protected getPackageVersionEntity(pkg: PackageEntity, version: string): Promise<PackageVersionEntity>;
32
36
  protected getAndCheckVersionFromFilename(ctx: EggContext, fullname: string, filenameWithVersion: string): string;
@@ -31,6 +31,21 @@ class AbstractController extends middleware_1.MiddlewareController {
31
31
  isPrivateScope(scope) {
32
32
  return scope && this.config.cnpmcore.allowScopes.includes(scope);
33
33
  }
34
+ async ensurePublishAccess(ctx, fullname, checkPkgExist = true) {
35
+ const user = await this.userRoleManager.checkPublishAccess(ctx, fullname);
36
+ let pkg = null;
37
+ if (checkPkgExist) {
38
+ const [scope, name] = (0, PackageUtil_1.getScopeAndName)(fullname);
39
+ pkg = await this.packageRepository.findPackage(scope, name);
40
+ if (!pkg) {
41
+ throw this.createPackageNotFoundError(fullname, undefined);
42
+ }
43
+ }
44
+ return {
45
+ pkg,
46
+ user,
47
+ };
48
+ }
34
49
  get syncNotFound() {
35
50
  return this.config.cnpmcore.syncNotFound;
36
51
  }
@@ -51,9 +66,14 @@ class AbstractController extends middleware_1.MiddlewareController {
51
66
  allowSync = true;
52
67
  return allowSync;
53
68
  }
54
- createPackageNotFoundError(fullname, version, allowSync = false) {
69
+ createPackageNotFoundError(fullname, version) {
55
70
  const message = version ? `${fullname}@${version} not found` : `${fullname} not found`;
56
71
  const err = new PackageNotFoundError(message);
72
+ return err;
73
+ }
74
+ createPackageNotFoundErrorWithRedirect(fullname, version, allowSync = false) {
75
+ // const err = new PackageNotFoundError(message);
76
+ const err = this.createPackageNotFoundError(fullname, version);
57
77
  const [scope] = (0, PackageUtil_1.getScopeAndName)(fullname);
58
78
  // dont sync private scope
59
79
  if (!this.isPrivateScope(scope)) {
@@ -85,22 +105,12 @@ class AbstractController extends middleware_1.MiddlewareController {
85
105
  const [scope, name] = (0, PackageUtil_1.getScopeAndName)(fullname);
86
106
  return await this.getPackageEntity(scope, name);
87
107
  }
88
- // 1. get package
89
- // 2. check current user is maintainer
90
- // 3. make sure current token can publish
91
- async getPackageEntityAndRequiredMaintainer(ctx, fullname) {
92
- const [scope, name] = (0, PackageUtil_1.getScopeAndName)(fullname);
93
- const pkg = await this.getPackageEntity(scope, name);
94
- const authorizedUser = await this.userRoleManager.requiredAuthorizedUser(ctx, 'publish');
95
- await this.userRoleManager.requiredPackageMaintainer(pkg, authorizedUser);
96
- return pkg;
97
- }
98
108
  // try to get package entity, throw NotFoundError when package not exists
99
109
  async getPackageEntity(scope, name) {
100
110
  const packageEntity = await this.packageRepository.findPackage(scope, name);
101
111
  if (!packageEntity) {
102
112
  const fullname = (0, PackageUtil_1.getFullname)(scope, name);
103
- throw this.createPackageNotFoundError(fullname);
113
+ throw this.createPackageNotFoundErrorWithRedirect(fullname);
104
114
  }
105
115
  return packageEntity;
106
116
  }
@@ -155,4 +165,4 @@ __decorate([
155
165
  __metadata("design:type", UserService_1.UserService)
156
166
  ], AbstractController.prototype, "userService", void 0);
157
167
  exports.AbstractController = AbstractController;
158
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQWJzdHJhY3RDb250cm9sbGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vYXBwL3BvcnQvY29udHJvbGxlci9BYnN0cmFjdENvbnRyb2xsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBQUEsMkNBR29CO0FBQ3BCLHNDQUdxQjtBQUtyQiw4Q0FBcUQ7QUFDckQsd0RBQXFEO0FBQ3JELDBFQUF1RTtBQUN2RSxvRUFBaUU7QUFDakUsMERBQXdFO0FBR3hFLGdFQUE2RDtBQUM3RCx3Q0FFb0I7QUFFcEIsTUFBTSxvQkFBcUIsU0FBUSwwQkFBYTtDQUFHO0FBRW5ELE1BQXNCLGtCQUFtQixTQUFRLGlDQUFvQjtJQWNuRSxJQUFjLGNBQWM7UUFDMUIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQUM7SUFDN0MsQ0FBQztJQUVELElBQWMsVUFBVTtRQUN0QixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFFBQVEsS0FBSyxLQUFLLElBQUksSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsUUFBUSxLQUFLLE9BQU8sQ0FBQztJQUM5RixDQUFDO0lBRVMsY0FBYyxDQUFDLEtBQWE7UUFDcEMsT0FBTyxLQUFLLElBQUksSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUNuRSxDQUFDO0lBRUQsSUFBYyxZQUFZO1FBQ3hCLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDO0lBQzNDLENBQUM7SUFFRCxJQUFjLGdCQUFnQjtRQUM1QixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLGdCQUFnQixDQUFDO0lBQy9DLENBQUM7SUFFUyxZQUFZLENBQUMsR0FBZTtRQUNwQyxJQUFJLFNBQVMsR0FBRyxLQUFLLENBQUM7UUFFdEIsZ0VBQWdFO1FB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
168
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQWJzdHJhY3RDb250cm9sbGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vYXBwL3BvcnQvY29udHJvbGxlci9BYnN0cmFjdENvbnRyb2xsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBQUEsMkNBR29CO0FBQ3BCLHNDQUdxQjtBQUtyQiw4Q0FBcUQ7QUFDckQsd0RBQXFEO0FBQ3JELDBFQUF1RTtBQUN2RSxvRUFBaUU7QUFDakUsMERBQXdFO0FBR3hFLGdFQUE2RDtBQUM3RCx3Q0FFb0I7QUFFcEIsTUFBTSxvQkFBcUIsU0FBUSwwQkFBYTtDQUFHO0FBRW5ELE1BQXNCLGtCQUFtQixTQUFRLGlDQUFvQjtJQWNuRSxJQUFjLGNBQWM7UUFDMUIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQUM7SUFDN0MsQ0FBQztJQUVELElBQWMsVUFBVTtRQUN0QixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFFBQVEsS0FBSyxLQUFLLElBQUksSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsUUFBUSxLQUFLLE9BQU8sQ0FBQztJQUM5RixDQUFDO0lBRVMsY0FBYyxDQUFDLEtBQWE7UUFDcEMsT0FBTyxLQUFLLElBQUksSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUNuRSxDQUFDO0lBRVMsS0FBSyxDQUFDLG1CQUFtQixDQUFDLEdBQWUsRUFBRSxRQUFnQixFQUFFLGFBQWEsR0FBRyxJQUFJO1FBQ3pGLE1BQU0sSUFBSSxHQUFHLE1BQU0sSUFBSSxDQUFDLGVBQWUsQ0FBQyxrQkFBa0IsQ0FBQyxHQUFHLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFDMUUsSUFBSSxHQUFHLEdBQXlCLElBQUksQ0FBQztRQUNyQyxJQUFJLGFBQWEsRUFBRTtZQUNqQixNQUFNLENBQUUsS0FBSyxFQUFF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
@@ -34,7 +34,8 @@ let PackageTagController = class PackageTagController extends AbstractController
34
34
  async saveTag(ctx, fullname, tag, version) {
35
35
  const data = { tag, version };
36
36
  ctx.tValidate(typebox_1.TagWithVersionRule, data);
37
- const pkg = await this.getPackageEntityAndRequiredMaintainer(ctx, fullname);
37
+ const ensureRes = await this.ensurePublishAccess(ctx, fullname, true);
38
+ const pkg = ensureRes.pkg;
38
39
  const packageVersion = await this.getPackageVersionEntity(pkg, data.version);
39
40
  await this.packageManagerService.savePackageTag(pkg, data.tag, packageVersion.version);
40
41
  return { ok: true };
@@ -46,7 +47,8 @@ let PackageTagController = class PackageTagController extends AbstractController
46
47
  if (tag === 'latest') {
47
48
  throw new egg_errors_1.ForbiddenError('Can\'t remove the "latest" tag');
48
49
  }
49
- const pkg = await this.getPackageEntityAndRequiredMaintainer(ctx, fullname);
50
+ const ensureRes = await this.ensurePublishAccess(ctx, fullname, true);
51
+ const pkg = ensureRes.pkg;
50
52
  await this.packageManagerService.removePackageTag(pkg, data.tag);
51
53
  return { ok: true };
52
54
  }
@@ -99,4 +101,4 @@ PackageTagController = __decorate([
99
101
  (0, tegg_1.HTTPController)()
100
102
  ], PackageTagController);
101
103
  exports.PackageTagController = PackageTagController;
102
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFja2FnZVRhZ0NvbnRyb2xsZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvcG9ydC9jb250cm9sbGVyL1BhY2thZ2VUYWdDb250cm9sbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNDQVNxQjtBQUNyQiwyQ0FBNEM7QUFDNUMsNkRBQTBEO0FBQzFELDBEQUErRDtBQUMvRCxvRkFBaUY7QUFDakYsd0NBQXlEO0FBR2xELElBQU0sb0JBQW9CLEdBQTFCLE1BQU0sb0JBQXFCLFNBQVEsdUNBQWtCO0lBV3BELEFBQU4sS0FBSyxDQUFDLFFBQVEsQ0FBYyxRQUFnQjtRQUMxQyxNQUFNLGFBQWEsR0FBRyxNQUFNLElBQUksQ0FBQywwQkFBMEIsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUN0RSxNQUFNLFdBQVcsR0FBRyxNQUFNLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxlQUFlLENBQUMsYUFBYSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQzFGLE1BQU0sSUFBSSxHQUFHLEVBQUUsQ0FBQztRQUNoQixLQUFLLE1BQU0sTUFBTSxJQUFJLFdBQVcsRUFBRTtZQUNoQyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQUM7U0FDbkM7UUFDRCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRCw0RkFBNEY7SUFDNUYsNEVBQTRFO0lBTXRFLEFBQU4sS0FBSyxDQUFDLE9BQU8sQ0FBWSxHQUFlLEVBQWUsUUFBZ0IsRUFBZSxHQUFXLEVBQWMsT0FBZTtRQUM1SCxNQUFNLElBQUksR0FBRyxFQUFFLEdBQUcsRUFBRSxPQUFPLEVBQUUsQ0FBQztRQUM5QixHQUFHLENBQUMsU0FBUyxDQUFDLDRCQUFrQixFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ3hDLE1BQU0sR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLHFDQUFxQyxDQUFDLEdBQUcsRUFBRSxRQUFRLENBQUMsQ0FBQztRQUM1RSxNQUFNLGNBQWMsR0FBRyxNQUFNLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQzdFLE1BQU0sSUFBSSxDQUFDLHFCQUFxQixDQUFDLGNBQWMsQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLEdBQUcsRUFBRSxjQUFjLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDdkYsT0FBTyxFQUFFLEVBQUUsRUFBRSxJQUFJLEVBQUUsQ0FBQztJQUN0QixDQUFDO0lBRUQsdUVBQXVFO0lBTWpFLEFBQU4sS0FBSyxDQUFDLFNBQVMsQ0FBWSxHQUFlLEVBQWUsUUFBZ0IsRUFBZSxHQUFXO1FBQ2pHLE1BQU0sSUFBSSxHQUFHLEVBQUUsR0FBRyxFQUFFLENBQUM7UUFDckIsR0FBRyxDQUFDLFNBQVMsQ0FBQyxpQkFBTyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQzdCLElBQUksR0FBRyxLQUFLLFFBQVEsRUFBRTtZQUNwQixNQUFNLElBQUksMkJBQWMsQ0FBQyxnQ0FBZ0MsQ0FBQyxDQUFDO1NBQzVEO1FBQ0QsTUFBTSxHQUFHLEdBQUcsTUFBTSxJQUFJLENBQUMscUNBQXFDLENBQUMsR0FBRyxFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBQzVFLE1BQU0sSUFBSSxDQUFDLHFCQUFxQixDQUFDLGdCQUFnQixDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDakUsT0FBTyxFQUFFLEVBQUUsRUFBRSxJQUFJLEVBQUUsQ0FBQztJQUN0QixDQUFDO0NBQ0YsQ0FBQTtBQXBEQztJQUFDLElBQUEsYUFBTSxHQUFFOzhCQUNzQiw2Q0FBcUI7bUVBQUM7QUFTL0M7SUFQTCxJQUFBLGlCQUFVLEVBQUM7UUFDVixxQ0FBcUM7UUFDckMsMkRBQTJEO1FBQzNELHNFQUFzRTtRQUN0RSxJQUFJLEVBQUUsd0JBQXdCLGlDQUFtQixhQUFhO1FBQzlELE1BQU0sRUFBRSxxQkFBYyxDQUFDLEdBQUc7S0FDM0IsQ0FBQztJQUNjLFdBQUEsSUFBQSxnQkFBUyxHQUFFLENBQUE7Ozs7b0RBUTFCO0FBU0s7SUFMTCxJQUFBLGlCQUFVLEVBQUM7UUFDViwwQ0FBMEM7UUFDMUMsSUFBSSxFQUFFLHdCQUF3QixpQ0FBbUIsa0JBQWtCO1FBQ25FLE1BQU0sRUFBRSxxQkFBYyxDQUFDLEdBQUc7S0FDM0IsQ0FBQztJQUNhLFdBQUEsSUFBQSxjQUFPLEdBQUUsQ0FBQTtJQUFtQixXQUFBLElBQUEsZ0JBQVMsR0FBRSxDQUFBO0lBQW9CLFdBQUEsSUFBQSxnQkFBUyxHQUFFLENBQUE7SUFBZSxXQUFBLElBQUEsZUFBUSxHQUFFLENBQUE7Ozs7bURBTzdHO0FBUUs7SUFMTCxJQUFBLGlCQUFVLEVBQUM7UUFDViw2Q0FBNkM7UUFDN0MsSUFBSSxFQUFFLHdCQUF3QixpQ0FBbUIsa0JBQWtCO1FBQ25FLE1BQU0sRUFBRSxxQkFBYyxDQUFDLE1BQU07S0FDOUIsQ0FBQztJQUNlLFdBQUEsSUFBQSxjQUFPLEdBQUUsQ0FBQTtJQUFtQixXQUFBLElBQUEsZ0JBQVMsR0FBRSxDQUFBO0lBQW9CLFdBQUEsSUFBQSxnQkFBUyxHQUFFLENBQUE7Ozs7cURBU3RGO0FBcERVLG9CQUFvQjtJQURoQyxJQUFBLHFCQUFjLEdBQUU7R0FDSixvQkFBb0IsQ0FxRGhDO0FBckRZLG9EQUFvQiJ9
104
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFja2FnZVRhZ0NvbnRyb2xsZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvcG9ydC9jb250cm9sbGVyL1BhY2thZ2VUYWdDb250cm9sbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNDQVNxQjtBQUNyQiwyQ0FBNEM7QUFDNUMsNkRBQTBEO0FBQzFELDBEQUErRDtBQUMvRCxvRkFBaUY7QUFDakYsd0NBQXlEO0FBR2xELElBQU0sb0JBQW9CLEdBQTFCLE1BQU0sb0JBQXFCLFNBQVEsdUNBQWtCO0lBV3BELEFBQU4sS0FBSyxDQUFDLFFBQVEsQ0FBYyxRQUFnQjtRQUMxQyxNQUFNLGFBQWEsR0FBRyxNQUFNLElBQUksQ0FBQywwQkFBMEIsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUN0RSxNQUFNLFdBQVcsR0FBRyxNQUFNLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxlQUFlLENBQUMsYUFBYSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQzFGLE1BQU0sSUFBSSxHQUFHLEVBQUUsQ0FBQztRQUNoQixLQUFLLE1BQU0sTUFBTSxJQUFJLFdBQVcsRUFBRTtZQUNoQyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQUM7U0FDbkM7UUFDRCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRCw0RkFBNEY7SUFDNUYsNEVBQTRFO0lBTXRFLEFBQU4sS0FBSyxDQUFDLE9BQU8sQ0FBWSxHQUFlLEVBQWUsUUFBZ0IsRUFBZSxHQUFXLEVBQWMsT0FBZTtRQUM1SCxNQUFNLElBQUksR0FBRyxFQUFFLEdBQUcsRUFBRSxPQUFPLEVBQUUsQ0FBQztRQUM5QixHQUFHLENBQUMsU0FBUyxDQUFDLDRCQUFrQixFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ3hDLE1BQU0sU0FBUyxHQUFHLE1BQU0sSUFBSSxDQUFDLG1CQUFtQixDQUFDLEdBQUcsRUFBRSxRQUFRLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDdEUsTUFBTSxHQUFHLEdBQUcsU0FBUyxDQUFDLEdBQUksQ0FBQztRQUMzQixNQUFNLGNBQWMsR0FBRyxNQUFNLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQzdFLE1BQU0sSUFBSSxDQUFDLHFCQUFxQixDQUFDLGNBQWMsQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLEdBQUcsRUFBRSxjQUFjLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDdkYsT0FBTyxFQUFFLEVBQUUsRUFBRSxJQUFJLEVBQUUsQ0FBQztJQUN0QixDQUFDO0lBRUQsdUVBQXVFO0lBTWpFLEFBQU4sS0FBSyxDQUFDLFNBQVMsQ0FBWSxHQUFlLEVBQWUsUUFBZ0IsRUFBZSxHQUFXO1FBQ2pHLE1BQU0sSUFBSSxHQUFHLEVBQUUsR0FBRyxFQUFFLENBQUM7UUFDckIsR0FBRyxDQUFDLFNBQVMsQ0FBQyxpQkFBTyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQzdCLElBQUksR0FBRyxLQUFLLFFBQVEsRUFBRTtZQUNwQixNQUFNLElBQUksMkJBQWMsQ0FBQyxnQ0FBZ0MsQ0FBQyxDQUFDO1NBQzVEO1FBQ0QsTUFBTSxTQUFTLEdBQUcsTUFBTSxJQUFJLENBQUMsbUJBQW1CLENBQUMsR0FBRyxFQUFFLFFBQVEsRUFBRSxJQUFJLENBQUMsQ0FBQztRQUN0RSxNQUFNLEdBQUcsR0FBRyxTQUFTLENBQUMsR0FBSSxDQUFDO1FBQzNCLE1BQU0sSUFBSSxDQUFDLHFCQUFxQixDQUFDLGdCQUFnQixDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDakUsT0FBTyxFQUFFLEVBQUUsRUFBRSxJQUFJLEVBQUUsQ0FBQztJQUN0QixDQUFDO0NBQ0YsQ0FBQTtBQXREQztJQUFDLElBQUEsYUFBTSxHQUFFOzhCQUNzQiw2Q0FBcUI7bUVBQUM7QUFTL0M7SUFQTCxJQUFBLGlCQUFVLEVBQUM7UUFDVixxQ0FBcUM7UUFDckMsMkRBQTJEO1FBQzNELHNFQUFzRTtRQUN0RSxJQUFJLEVBQUUsd0JBQXdCLGlDQUFtQixhQUFhO1FBQzlELE1BQU0sRUFBRSxxQkFBYyxDQUFDLEdBQUc7S0FDM0IsQ0FBQztJQUNjLFdBQUEsSUFBQSxnQkFBUyxHQUFFLENBQUE7Ozs7b0RBUTFCO0FBU0s7SUFMTCxJQUFBLGlCQUFVLEVBQUM7UUFDViwwQ0FBMEM7UUFDMUMsSUFBSSxFQUFFLHdCQUF3QixpQ0FBbUIsa0JBQWtCO1FBQ25FLE1BQU0sRUFBRSxxQkFBYyxDQUFDLEdBQUc7S0FDM0IsQ0FBQztJQUNhLFdBQUEsSUFBQSxjQUFPLEdBQUUsQ0FBQTtJQUFtQixXQUFBLElBQUEsZ0JBQVMsR0FBRSxDQUFBO0lBQW9CLFdBQUEsSUFBQSxnQkFBUyxHQUFFLENBQUE7SUFBZSxXQUFBLElBQUEsZUFBUSxHQUFFLENBQUE7Ozs7bURBUTdHO0FBUUs7SUFMTCxJQUFBLGlCQUFVLEVBQUM7UUFDViw2Q0FBNkM7UUFDN0MsSUFBSSxFQUFFLHdCQUF3QixpQ0FBbUIsa0JBQWtCO1FBQ25FLE1BQU0sRUFBRSxxQkFBYyxDQUFDLE1BQU07S0FDOUIsQ0FBQztJQUNlLFdBQUEsSUFBQSxjQUFPLEdBQUUsQ0FBQTtJQUFtQixXQUFBLElBQUEsZ0JBQVMsR0FBRSxDQUFBO0lBQW9CLFdBQUEsSUFBQSxnQkFBUyxHQUFFLENBQUE7Ozs7cURBVXRGO0FBdERVLG9CQUFvQjtJQURoQyxJQUFBLHFCQUFjLEdBQUU7R0FDSixvQkFBb0IsQ0F1RGhDO0FBdkRZLG9EQUFvQiJ9