-
Notifications
You must be signed in to change notification settings - Fork 512
Limit configuration available publicly in config.json #5045
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Aryakoste
wants to merge
2
commits into
DSpace:main
Choose a base branch
from
Aryakoste:limit-config-public
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -169,6 +169,23 @@ const buildBaseUrl = (config: ServerConfig): void => { | |
| ].join(''); | ||
| }; | ||
|
|
||
| /** | ||
| * Removes all server-side specific settings from the application configuration. | ||
| * This method is used to ensure the "assets/config.json" that provides runtime | ||
| * configuration to CSR (client side rendering) excludes these server-side keys. | ||
| * | ||
| * @param config the application configuration | ||
| */ | ||
| const removeServerSideConfig = (config: AppConfig): any => { | ||
| const clientConfig = JSON.parse(JSON.stringify(config)); | ||
| delete clientConfig.rest.ssrBaseUrl; | ||
| delete clientConfig.rest.hasSsrBaseUrl; | ||
| delete clientConfig.cache.serverSide; | ||
| delete clientConfig.ui.rateLimiter; | ||
| delete clientConfig.ui.useProxies; | ||
| return clientConfig; | ||
| }; | ||
|
Comment on lines
+180
to
+187
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could this be inverted to only return client config properties (instead of deleting server properties)? In the case that a config property is added in the future without someone knowing about this vulnerability, it should default to not being in the client config. |
||
|
|
||
| /** | ||
| * Build app config with the following chain of override. | ||
| * | ||
|
|
@@ -247,7 +264,8 @@ export const buildAppConfig = (destConfigPath?: string): AppConfig => { | |
| buildBaseUrl(appConfig.rest); | ||
|
|
||
| if (isNotEmpty(destConfigPath)) { | ||
| writeFileSync(destConfigPath, JSON.stringify(appConfig, null, 2)); | ||
| const clientConfig = removeServerSideConfig(appConfig); | ||
| writeFileSync(destConfigPath, JSON.stringify(clientConfig, null, 2)); | ||
|
|
||
| console.log(`Angular ${bold('config.json')} file generated correctly at ${bold(destConfigPath)} \n`); | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Aryakoste : Please add an inline comment above this to describe why we're doing this. It could be something like this: