feat!: apply restrictions to air gapped environments by MarcosSpessatto · Pull Request #33241 · RocketChat/Rocket.Chat

MarcosSpessatto · 2024-09-10T15:28:47Z

Proposed changes (including videos or screenshots)

This PR introduces some restrictions when running an air-gapped environment

AIR-5
AIR-6
AIR-10

Issue(s)

Steps to test or reproduce

Further comments

dionisio-bot · 2024-09-10T15:28:51Z

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

changeset-bot · 2024-09-10T15:28:51Z

🦋 Changeset detected

Latest commit: 879df1d

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 37 packages

Name	Type
@rocket.chat/meteor	Major
@rocket.chat/i18n	Major
@rocket.chat/license	Major
@rocket.chat/mock-providers	Patch
@rocket.chat/ui-contexts	Major
@rocket.chat/web-ui-registration	Major
@rocket.chat/fuselage-ui-kit	Major
@rocket.chat/ui-client	Major
@rocket.chat/ui-voip	Major
@rocket.chat/uikit-playground	Patch
@rocket.chat/gazzodown	Major
@rocket.chat/livechat	Patch
@rocket.chat/ui-avatar	Major
@rocket.chat/ui-video-conf	Major
@rocket.chat/core-typings	Major
@rocket.chat/rest-typings	Major
@rocket.chat/api-client	Patch
@rocket.chat/apps	Patch
@rocket.chat/core-services	Patch
@rocket.chat/cron	Patch
@rocket.chat/ddp-client	Patch
@rocket.chat/freeswitch	Patch
@rocket.chat/model-typings	Patch
@rocket.chat/account-service	Patch
@rocket.chat/authorization-service	Patch
@rocket.chat/ddp-streamer	Patch
@rocket.chat/omnichannel-transcript	Patch
@rocket.chat/presence-service	Patch
@rocket.chat/queue-worker	Patch
@rocket.chat/stream-hub-service	Patch
@rocket.chat/omnichannel-services	Patch
@rocket.chat/pdf-worker	Patch
@rocket.chat/presence	Patch
rocketchat-services	Patch
@rocket.chat/network-broker	Patch
@rocket.chat/models	Patch
@rocket.chat/instance-status	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

ee/packages/license/src/token.ts

 const PUBLIC_LICENSE_KEY_V2 =
 	'LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQ0lqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FnOEFNSUlDQ2dLQ0FnRUFxV1Nza2Q5LzZ6Ung4a3lQY2ljcwpiMzJ3Mnd4VnV3N3lCVDk2clEvOEQreU1lQ01POXdTU3BIYS85bkZ5d293RXRpZ3B0L3dyb1BOK1ZHU3didHdQCkZYQmVxRWxCbmRHRkFsODZlNStFbGlIOEt6L2hHbkNtSk5tWHB4RUsyUkUwM1g0SXhzWVg3RERCN010eC9pcXMKY2pCL091dlNCa2ppU2xlUzdibE5JVC9kQTdLNC9DSjNvaXUwMmJMNEV4Y2xDSGVwenFOTWVQM3dVWmdweE9uZgpOT3VkOElYWUs3M3pTY3VFOEUxNTdZd3B6Q0twVmFIWDdaSmY4UXVOc09PNVcvYUlqS2wzTDYyNjkrZUlPRXJHCndPTm1hSG56Zmc5RkxwSmh6Z3BPMzhhVm43NnZENUtLakJhaldza1krNGEyZ1NRbUtOZUZxYXFPb3p5RUZNMGUKY0ZXWlZWWjNMZWg0dkVNb1lWUHlJeng5Nng4ZjIveW1QbmhJdXZRdjV3TjRmeWVwYTdFWTVVQ2NwNzF6OGtmUAo0RmNVelBBMElEV3lNaWhYUi9HNlhnUVFaNEdiL3FCQmh2cnZpSkNGemZZRGNKZ0w3RmVnRllIUDNQR0wwN1FnCnZMZXZNSytpUVpQcnhyYnh5U3FkUE9rZ3VyS2pWclhUVXI0QTlUZ2lMeUlYNVVsSnEzRS9SVjdtZk9xWm5MVGEKU0NWWEhCaHVQbG5DR1pSMDFUb1RDZktoTUcxdTBDRm5MMisxNWhDOWZxT21XdjlRa2U0M3FsSjBQZ0YzVkovWAp1eC9tVHBuazlnbmJHOUpIK21mSDM5Um9GdlROaW5Zd1NNdll6dXRWT242OXNPemR3aERsYTkwbDNBQ2g0eENWCks3Sk9YK3VIa29OdTNnMmlWeGlaVU0wQ0F3RUFBUT09Ci0tLS0tRU5EIFBVQkxJQyBLRVktLS0tLQo=';
+const PUBLIC_STATS_KEY_V2 =
+	'LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUFuT0IvR3lCUXg1cVJZOC83dGxhTApkd0hSOWZBWHVzQ3ZBVU9YRjFPYjExaWx4ejdqY0pqWitaRjE2UTk3bjF3UDlvQnJMUDg5M3ZXUlc1bUtDdFpDClJQNTdJU1o2YjlHOXoyNStnV0NEa3ZZUUg1djJlMGoxUnE5TnNYMktlTWViOUZXenRQVFEvdDRvUW1SdUpiTEIKV013ajRRbHZ4OStpdWpkdGdQYmx5S0VFM0I3T1RPWk8xNzNOK2RDZW8wOWlQcStyKzBiRjNGSTRVcVFiZkFrdApOdGd0OUxVbjdlalNaQXNhSTZPbVBmOVVvSzM4NUdxWUxvbk1WbXBFbmZyRDlHSHl0OXFOY2pCTmZ1MUJLZWlUClBwVit6WE1FViszLzZ2bi84OW1id28zS0ZtTnRxVTJpRk5Yak5Cb2w1ZE82N3VlM0pURXBVQmJWRHZ2V3gwTk8KWndJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0tCg==';


codecov · 2024-09-10T15:36:02Z

Codecov Report

Attention: Patch coverage is 93.98907% with 11 lines in your changes missing coverage. Please review.

Project coverage is 75.04%. Comparing base (274a89b) to head (879df1d).
Report is 2 commits behind head on develop.

Additional details and impacted files

@@             Coverage Diff             @@
##           develop   #33241      +/-   ##
===========================================
+ Coverage    74.88%   75.04%   +0.16%     
===========================================
  Files          473      479       +6     
  Lines        20810    20991     +181     
  Branches      5314     5328      +14     
===========================================
+ Hits         15583    15753     +170     
- Misses        4602     4611       +9     
- Partials       625      627       +2

Flag	Coverage Δ
unit	`75.04% <93.98%> (+0.16%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

github-actions · 2024-09-12T13:12:25Z

PR Preview Action v1.4.8
🚀 Deployed preview to https://RocketChat.github.io/Rocket.Chat/pr-preview/pr-33241/
on branch `gh-pages` at 2024-10-18 22:55 UTC

apps/meteor/ee/app/license/server/settings.ts

apps/meteor/ee/app/license/server/airGappedRestrictionsCheck.spec.ts

gabriellsh · 2024-09-27T22:48:42Z

I had to add the path for airgappedRestrictionsCheck.spec.ts in the mocharc.config file, since the tests were not working.

fixed

.changeset/little-gifts-do.md

ee/packages/license/src/AirGappedRestriction.ts

apps/meteor/ee/app/license/server/airGappedRestrictions.ts

sampaiodiego

since this is a breaking change, the target branch should be release-7.0.0

apps/meteor/ee/app/license/server/airGappedRestrictionsCheck.spec.ts

.changeset/little-gifts-do.md

apps/meteor/app/lib/server/methods/sendMessage.ts

apps/meteor/ee/app/license/server/airGappedRestrictions.ts

apps/meteor/ee/app/license/server/airGappedRestrictionsCheck.ts

* WIP * Add banner to sidebarV1 * fix useAirGappedRestriction unit tests * sidebarV1 banner section unit tests * Remove log * replicate banner on sidebarv2 * Fix tests * remove comment * Add go link and fix translation

apps/meteor/server/models/raw/Statistics.ts

ee/packages/license/src/AirGappedRestriction.ts

ee/packages/license/src/token.ts

packages/mock-providers/src/MockedAppRootBuilder.tsx

github-advanced-security bot found potential problems Sep 10, 2024

View reviewed changes

MarcosSpessatto changed the title ~~feat: apply restrictions to air gapped environments~~ feat!: apply restrictions to air gapped environments Sep 11, 2024

MarcosSpessatto added this to the 7.0 milestone Sep 11, 2024

MarcosSpessatto marked this pull request as ready for review September 11, 2024 15:54

MarcosSpessatto marked this pull request as draft September 12, 2024 13:00

MarcosSpessatto marked this pull request as ready for review September 12, 2024 15:41

MarcosSpessatto requested review from ggazzo and sampaiodiego September 12, 2024 15:41

gabriellsh requested changes Sep 12, 2024

View reviewed changes

apps/meteor/ee/app/license/server/settings.ts Outdated Show resolved Hide resolved

apps/meteor/ee/app/license/server/settings.ts Outdated Show resolved Hide resolved

MarcosSpessatto requested a review from gabriellsh September 13, 2024 11:13

gabriellsh previously requested changes Sep 27, 2024

View reviewed changes

apps/meteor/ee/app/license/server/airGappedRestrictionsCheck.spec.ts Outdated Show resolved Hide resolved

sampaiodiego requested changes Oct 1, 2024

View reviewed changes

KevLehman previously requested changes Oct 2, 2024

View reviewed changes

gabriellsh changed the base branch from develop to release-7.0.0 October 2, 2024 23:45

gabriellsh force-pushed the feat/airgapped-restrictions branch from 76fa753 to 9888016 Compare October 7, 2024 17:04

ggazzo force-pushed the release-7.0.0 branch from db12f46 to 52ca57d Compare October 8, 2024 17:42

ggazzo requested review from a team as code owners October 8, 2024 17:42

sampaiodiego force-pushed the release-7.0.0 branch 2 times, most recently from d1aa5f9 to 374979f Compare October 9, 2024 17:43

gabriellsh and others added 7 commits October 17, 2024 11:34

change from module to license check

2e9d7b7

add missing type

b656b13

fix license listener

3d7ef8b

add tests to ensure setting and rocket.cat message

510b6b0

remove cached settings

5ebc821

change test location

5affa86

feat!: Airgapped composer restriction and warning banner (#33382)

a4527e0

* WIP * Add banner to sidebarV1 * fix useAirGappedRestriction unit tests * sidebarV1 banner section unit tests * Remove log * replicate banner on sidebarv2 * Fix tests * remove comment * Add go link and fix translation

jeanfbrito previously approved these changes Oct 18, 2024

View reviewed changes

Merge branch 'develop' into feat/airgapped-restrictions

aa2a1b4

MarcosSpessatto added the stat: QA assured Means it has been tested and approved by a company insider label Oct 18, 2024

dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Oct 18, 2024

KevLehman reviewed Oct 18, 2024

View reviewed changes

apps/meteor/server/models/raw/Statistics.ts Show resolved Hide resolved

ee/packages/license/src/AirGappedRestriction.ts Show resolved Hide resolved

KevLehman previously approved these changes Oct 18, 2024

View reviewed changes

ggazzo reviewed Oct 18, 2024

View reviewed changes

ee/packages/license/src/token.ts Outdated Show resolved Hide resolved

ggazzo reviewed Oct 18, 2024

View reviewed changes

ee/packages/license/src/token.ts Outdated Show resolved Hide resolved

ggazzo reviewed Oct 18, 2024

View reviewed changes

ee/packages/license/src/token.ts Outdated Show resolved Hide resolved

ggazzo reviewed Oct 18, 2024

View reviewed changes

packages/mock-providers/src/MockedAppRootBuilder.tsx Show resolved Hide resolved

adjust name function

5c97fc1

ggazzo dismissed stale reviews from KevLehman and jeanfbrito via 5c97fc1 October 18, 2024 22:10

ggazzo approved these changes Oct 18, 2024

View reviewed changes

sampaiodiego approved these changes Oct 18, 2024

View reviewed changes

tassoevan approved these changes Oct 18, 2024

View reviewed changes

KevLehman approved these changes Oct 18, 2024

View reviewed changes

Merge branch 'develop' into feat/airgapped-restrictions

879df1d

ggazzo merged commit f33c07e into develop Oct 19, 2024

ggazzo deleted the feat/airgapped-restrictions branch October 19, 2024 00:44

This was referenced Oct 20, 2024

Release 7.0.0 #33677

Closed

Release 7.0.0 #33678

Closed

Release 7.0.0 #33679

Merged

Comments

Conversation

MarcosSpessatto commented Sep 10, 2024 • edited by gabriellsh Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Proposed changes (including videos or screenshots)

Issue(s)

Steps to test or reproduce

Further comments

Uh oh!

dionisio-bot bot commented Sep 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

changeset-bot bot commented Sep 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🦋 Changeset detected

Uh oh!

Check failure

codecov bot commented Sep 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

github-actions bot commented Sep 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gabriellsh commented Sep 27, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sampaiodiego left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

MarcosSpessatto commented Sep 10, 2024 •

edited by gabriellsh

Loading

dionisio-bot bot commented Sep 10, 2024 •

edited

Loading

changeset-bot bot commented Sep 10, 2024 •

edited

Loading

codecov bot commented Sep 10, 2024 •

edited

Loading

github-actions bot commented Sep 12, 2024 •

edited

Loading