Skip to content
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

Resolve critical and high security issues #3850

Closed
wants to merge 72 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
c11d6f2
Add logo and modes
igoroctaviano Sep 25, 2023
9eaeda8
Merge pull request #1 from ImagingDataCommons/feat/white-label
igoroctaviano Sep 25, 2023
0b5f630
Initial deployment config
wlongabaugh Sep 29, 2023
3916ede
Trigger deployment
wlongabaugh Sep 29, 2023
17852bf
Merge pull request #2 from ImagingDataCommons/wjrl-idc-deployment
wlongabaugh Sep 29, 2023
67aa569
Fix config name
wlongabaugh Sep 29, 2023
e9670d1
Merge pull request #3 from ImagingDataCommons/wjrl-idc-deployment
wlongabaugh Sep 29, 2023
5e22730
Fix config target dir slash
wlongabaugh Sep 29, 2023
4779f46
Merge pull request #4 from ImagingDataCommons/wjrl-idc-deployment
wlongabaugh Sep 29, 2023
abd92ac
Debug deploy
wlongabaugh Sep 29, 2023
e20ee5d
Merge pull request #5 from ImagingDataCommons/wjrl-idc-deployment
wlongabaugh Sep 29, 2023
0b73244
more debug deploy
wlongabaugh Sep 29, 2023
23a6b69
Merge pull request #6 from ImagingDataCommons/wjrl-idc-deployment
wlongabaugh Sep 29, 2023
01add7c
and more debug deploy
wlongabaugh Sep 29, 2023
5491113
Merge pull request #7 from ImagingDataCommons/wjrl-idc-deployment
wlongabaugh Sep 29, 2023
fdb4b31
Remove debug, fix dir
wlongabaugh Sep 29, 2023
aa26bcb
Merge pull request #8 from ImagingDataCommons/wjrl-idc-deployment
wlongabaugh Sep 29, 2023
203a1f1
Upgrade to Node 16 for V3
wlongabaugh Sep 29, 2023
e71401e
Merge pull request #9 from ImagingDataCommons/wjrl-idc-deployment
wlongabaugh Sep 29, 2023
30285f0
debug cloud copy
wlongabaugh Sep 29, 2023
7b19c8d
Merge pull request #10 from ImagingDataCommons/wjrl-idc-deployment
wlongabaugh Sep 29, 2023
a8d7f2e
debug cloud copy 2
wlongabaugh Sep 29, 2023
2e562da
Merge pull request #11 from ImagingDataCommons/wjrl-idc-deployment
wlongabaugh Sep 29, 2023
5ceeea5
debug cloud copy 3
wlongabaugh Sep 29, 2023
c608741
Merge pull request #12 from ImagingDataCommons/wjrl-idc-deployment
wlongabaugh Sep 29, 2023
fc79caa
debug cloud copy 4
wlongabaugh Sep 29, 2023
a574412
Merge pull request #13 from ImagingDataCommons/wjrl-idc-deployment
wlongabaugh Sep 29, 2023
48f588f
Fix path test
wlongabaugh Sep 29, 2023
d14fd37
Merge pull request #14 from ImagingDataCommons/wjrl-idc-deployment
wlongabaugh Sep 29, 2023
74b9e96
Change PATH_URL
wlongabaugh Sep 30, 2023
a2509a9
Merge pull request #15 from ImagingDataCommons/wjrl-idc-deployment
wlongabaugh Sep 30, 2023
496d177
Change PATH_URL again and destination folder
wlongabaugh Sep 30, 2023
ded97a6
Merge pull request #16 from ImagingDataCommons/wjrl-idc-deployment
wlongabaugh Sep 30, 2023
fb17bc8
Merge branch 'master' of github.com:OHIF/Viewers into update/ohif-v3.…
igoroctaviano Oct 20, 2023
3a09792
Merge pull request #17 from ImagingDataCommons/update/ohif-v3.8.0-beta.2
igoroctaviano Oct 20, 2023
4b9b285
Try V3 deploy again
wlongabaugh Oct 20, 2023
44b92be
Merge pull request #18 from ImagingDataCommons/wjrl-idc-deployment
wlongabaugh Oct 20, 2023
89bcb69
Try V3 deploy again 2x
wlongabaugh Oct 20, 2023
1acf31d
Merge pull request #19 from ImagingDataCommons/wjrl-idc-deployment
wlongabaugh Oct 20, 2023
2497a12
Try V3 deploy again 3x
wlongabaugh Oct 20, 2023
f9e906a
Merge pull request #20 from ImagingDataCommons/wjrl-idc-deployment
wlongabaugh Oct 20, 2023
b6d6daa
Try V3 deploy again 4x
wlongabaugh Oct 21, 2023
35a3428
Try V3 deploy again 5x
wlongabaugh Oct 21, 2023
e434c8e
Merge pull request #21 from ImagingDataCommons/wjrl-idc-deployment
wlongabaugh Oct 21, 2023
65f3cde
Try V3 deploy again 6x
wlongabaugh Oct 23, 2023
5128342
Merge pull request #22 from ImagingDataCommons/wjrl-idc-deployment
wlongabaugh Oct 23, 2023
eb87b9a
Bump modes
igoroctaviano Oct 23, 2023
de7a299
Merge branch 'master' of github.com:OHIF/Viewers into update/ohif-v3.…
igoroctaviano Oct 23, 2023
04156d5
Merge pull request #23 from ImagingDataCommons/update/ohif-v3.8.0-beta.4
igoroctaviano Oct 23, 2023
18c59cb
Fix logo
wlongabaugh Oct 23, 2023
4bc82e9
Merge pull request #24 from ImagingDataCommons/wjrl-idc-deployment
wlongabaugh Oct 23, 2023
a01ba22
Fix logo path
wlongabaugh Oct 27, 2023
b38d51f
Merge pull request #26 from ImagingDataCommons/wjrl-development
wlongabaugh Oct 27, 2023
6e615d9
Fix logo path again
wlongabaugh Oct 27, 2023
5544eed
Merge pull request #27 from ImagingDataCommons/wjrl-development
wlongabaugh Oct 27, 2023
bb656c6
Fix deploy branches
wlongabaugh Nov 3, 2023
0460988
Merge pull request #29 from ImagingDataCommons/wjrl-development
wlongabaugh Nov 3, 2023
6f17162
Fix deploy branches v2
wlongabaugh Nov 3, 2023
292b3f6
Merge pull request #31 from ImagingDataCommons/wjrl-development
wlongabaugh Nov 3, 2023
8900191
Disable baked in routes
igoroctaviano Nov 7, 2023
72c9fb3
Merge pull request #34 from ImagingDataCommons/feat/disable-baked-in-…
igoroctaviano Nov 7, 2023
122aca3
Merge branch 'master' of github.com:OHIF/Viewers into update/ohif-v3.…
igoroctaviano Nov 17, 2023
f4dd872
Merge pull request #36 from ImagingDataCommons/update/ohif-v3.8.0-bet…
igoroctaviano Nov 17, 2023
adc1ed8
Merge branch 'master' of github.com:OHIF/Viewers into update/ohif-v3.…
igoroctaviano Nov 29, 2023
b994944
Merge pull request #37 from ImagingDataCommons/update/ohif-v3.8.0-bet…
igoroctaviano Nov 29, 2023
a3e27be
Merge branch 'master' of github.com:OHIF/Viewers into feat/merge-data…
igoroctaviano Dec 6, 2023
498bfa2
Add secondary data source
igoroctaviano Dec 6, 2023
f2421a6
Update modes
igoroctaviano Dec 6, 2023
32b9625
Merge pull request #38 from ImagingDataCommons/feat/merge-datasource
igoroctaviano Dec 6, 2023
e0ef301
Merge branch 'master' of github.com:OHIF/Viewers into update/ohif-v3.…
igoroctaviano Dec 12, 2023
d50273d
Merge pull request #39 from ImagingDataCommons/update/ohif-v3.8.0-bet…
igoroctaviano Dec 12, 2023
6eee0ca
fix: security issues
pedrokohler Dec 12, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,049 changes: 628 additions & 421 deletions .circleci/config.yml

Large diffs are not rendered by default.

137 changes: 137 additions & 0 deletions idc-assets/IDC-Logo-WHITE.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
176 changes: 176 additions & 0 deletions idc-assets/app-config-template.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
window.config = {
routerBasename: '/v3',
whiteLabeling: {
createLogoComponentFn: function(React) {
return React.createElement(
'a',
{
target: '_self',
rel: 'noopener noreferrer',
className: 'text-purple-600 line-through',
href: '_X___IDC__LOGO__LINK___Y_',
},
React.createElement('img', {
src: '/v3/IDC-Logo-WHITE.svg',
className: 'w-14 h-14',
})
);
},
},
extensions: [],
modes: [],
customizationService: {},
showStudyList: false,
// some windows systems have issues with more than 3 web workers
maxNumberOfWebWorkers: 3,
// below flag is for performance reasons, but it might not work for all servers
showWarningMessageForCrossOrigin: true,
showCPUFallbackMessage: true,
showLoadingIndicator: true,
strictZSpacingForVolumeViewport: true,
maxNumRequests: {
interaction: 100,
thumbnail: 75,
// Prefetch number is dependent on the http protocol. For http 2 or
// above, the number of requests can be go a lot higher.
prefetch: 25,
},
// filterQueryParam: false,
defaultDataSourceName: 'idc',
/* Dynamic config allows user to pass "configUrl" query string this allows to load config without recompiling application. The regex will ensure valid configuration source */
// dangerouslyUseDynamicConfig: {
// enabled: true,
// // regex will ensure valid configuration source and default is /.*/ which matches any character. To use this, setup your own regex to choose a specific source of configuration only.
// // Example 1, to allow numbers and letters in an absolute or sub-path only.
// // regex: /(0-9A-Za-z.]+)(\/[0-9A-Za-z.]+)*/
// // Example 2, to restricts to either hosptial.com or othersite.com.
// // regex: /(https:\/\/hospital.com(\/[0-9A-Za-z.]+)*)|(https:\/\/othersite.com(\/[0-9A-Za-z.]+)*)/
// regex: /.*/,
// },
dataSources: [
{
friendlyName: 'IDC Data Source',
namespace: '@ohif/extension-default.dataSourcesModule.dicomweb',
sourceName: 'idc',
configuration: {
name: 'idc',
wadoUriRoot: '_X___IDC__Z__ROOT___Y_',
qidoRoot: '_X___IDC__Z__ROOT___Y_',
wadoRoot: '_X___IDC__Z__ROOT___Y_',
qidoSupportsIncludeField: false,
supportsReject: false,
imageRendering: 'wadors',
thumbnailRendering: 'wadors',
enableStudyLazyLoad: true,
supportsFuzzyMatching: false,
supportsWildcard: false,
staticWado: true,
singlepart: 'bulkdata,video',
omitQuotationForMultipartRequest: true,
},
},
],
httpErrorHandler: error => {
// This is 429 when rejected from the public idc sandbox too often.
console.warn(error.status);
if (error.status == 429) {
// Could use services manager here to bring up a dialog/modal if needed.
// console.warn('test, navigate to https://ohif.org/');
window.location = '_X___IDC__Z__QUOTA___Y_';
}
},
hotkeys: [
{
commandName: 'incrementActiveViewport',
label: 'Next Viewport',
keys: ['right'],
},
{
commandName: 'decrementActiveViewport',
label: 'Previous Viewport',
keys: ['left'],
},
{ commandName: 'rotateViewportCW', label: 'Rotate Right', keys: ['r'] },
{ commandName: 'rotateViewportCCW', label: 'Rotate Left', keys: ['l'] },
{ commandName: 'invertViewport', label: 'Invert', keys: ['i'] },
{
commandName: 'flipViewportHorizontal',
label: 'Flip Horizontally',
keys: ['h'],
},
{
commandName: 'flipViewportVertical',
label: 'Flip Vertically',
keys: ['v'],
},
{ commandName: 'scaleUpViewport', label: 'Zoom In', keys: ['+'] },
{ commandName: 'scaleDownViewport', label: 'Zoom Out', keys: ['-'] },
{ commandName: 'fitViewportToWindow', label: 'Zoom to Fit', keys: ['='] },
{ commandName: 'resetViewport', label: 'Reset', keys: ['space'] },
{ commandName: 'nextImage', label: 'Next Image', keys: ['down'] },
{ commandName: 'previousImage', label: 'Previous Image', keys: ['up'] },
// {
// commandName: 'previousViewportDisplaySet',
// label: 'Previous Series',
// keys: ['pagedown'],
// },
// {
// commandName: 'nextViewportDisplaySet',
// label: 'Next Series',
// keys: ['pageup'],
// },
{
commandName: 'setToolActive',
commandOptions: { toolName: 'Zoom' },
label: 'Zoom',
keys: ['z'],
},
// ~ Window level presets
{
commandName: 'windowLevelPreset1',
label: 'W/L Preset 1',
keys: ['1'],
},
{
commandName: 'windowLevelPreset2',
label: 'W/L Preset 2',
keys: ['2'],
},
{
commandName: 'windowLevelPreset3',
label: 'W/L Preset 3',
keys: ['3'],
},
{
commandName: 'windowLevelPreset4',
label: 'W/L Preset 4',
keys: ['4'],
},
{
commandName: 'windowLevelPreset5',
label: 'W/L Preset 5',
keys: ['5'],
},
{
commandName: 'windowLevelPreset6',
label: 'W/L Preset 6',
keys: ['6'],
},
{
commandName: 'windowLevelPreset7',
label: 'W/L Preset 7',
keys: ['7'],
},
{
commandName: 'windowLevelPreset8',
label: 'W/L Preset 8',
keys: ['8'],
},
{
commandName: 'windowLevelPreset9',
label: 'W/L Preset 9',
keys: ['9'],
},
],
};

Binary file added idc-assets/favicon-nci-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added idc-assets/favicon-nci-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added idc-assets/favicon-nci.ico
Binary file not shown.
11 changes: 11 additions & 0 deletions idc-assets/viewer_deployment_config.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#
# !! Delete these comments before using !!
# This is a template for the configuration file used during deployment.
# Replace with your values, and place in your deployment bucket/folder as viewer_deployment_config.txt
# that is pointed to by DEPLOYMENT_BUCKET_IDC_XXX CircleCI env var.
#
WBUCKET=bucket-name-where-viewer-will-be-deployed
QUOTA_PAGE=https://url-of-a-page-where-viewer-redirects-when-429-is-caught.html
STORE_ROOT=https://name-of-throttle-proxy.example.com/v1/projects/gcp-project-name/locations/project-location/datasets/dataset-name/dicomStores/dicom-store-name/dicomWeb
CONFIG_ONLY=False
LOGO_LINK=https://url-of-a-destination-page-for-logo-click.html
Loading