Skip to content

Commit

Permalink
#128 Support server-side encryption (#129)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ayselafsar
ayselafsar authored Oct 18, 2024
1 parent de6c477 commit d38f15f
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 15 deletions.
2 changes: 1 addition & 1 deletion acanio-viewer
Submodule acanio-viewer updated 12 files
+4 −2 CHANGELOG.md
+1 −1 CODE_OF_CONDUCT.md
+1 −1 extensions/cornerstone/src/tools/ImageOverlayViewerTool.tsx
+1 −1 extensions/cornerstone/src/tools/OverlayPlaneModuleProvider.ts
+1 −1 platform/app/package.json
+9 −4 platform/app/src/routes/Mode/Mode.tsx
+1 −1 platform/docs/docs/deployment/user-account-control.md
+1 −1 platform/docs/docs/platform/extensions/modules/hpModule.md
+0 −0 platform/docs/docs/platform/theming.md
+1 −1 platform/docs/versioned_docs/version-2.0-deprecated/deployment/recipes/user-account-control.md
+4 −4 platform/docs/versioned_docs/version-2.0-deprecated/viewer/theming.md
+1 −1 version-product.txt
67 changes: 53 additions & 14 deletions lib/Controller/DisplayController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,15 +134,19 @@ private function convertToUTF8($d) {

private function getAllDICOMFilesInFolder($parentPathToRemove, $folderNode, $isOpenNoExtension) {
$filepaths = array();
$filenodes = array();
$nodes = $folderNode->getDirectoryListing();
foreach($nodes as $node) {
if ($node->getType() == 'dir') {
$filepaths = array_merge($filepaths, $this->getAllDICOMFilesInFolder($parentPathToRemove, $node, $isOpenNoExtension));
list($dicomFilePaths, $dicomFileNodes) = $this->getAllDICOMFilesInFolder($parentPathToRemove, $node, $isOpenNoExtension);
$filepaths = array_merge($filepaths, $dicomFilePaths);
$filenodes = array_merge($filenodes, $dicomFileNodes);
} else if ($node->getType() == 'file' && ($isOpenNoExtension || $node->getMimetype() == 'application/dicom')) {
array_push($filepaths, implode('', explode($parentPathToRemove, $node->getPath(), 2)));
array_push($filenodes, $node);
}
}
return $filepaths;
return array($filepaths, $filenodes);
}

private function getContentSecurityPolicy() {
Expand All @@ -164,10 +168,16 @@ private function getContentSecurityPolicy() {
return $policy;
}

private function generateDICOMJson($dicomFilePaths, $selectedFileFullPath, $parentFullPath, $currentUserPathToFile, $downloadUrlPrefix, $isPublic, $singlePublicFileDownload) {
private function isEncryptionEnabled() {
// Check if server-side encryption is enabled in the config
$encryptionEnabled = $this->config->getAppValue('encryption', 'enabled', 'no');
return $encryptionEnabled === 'yes';
}

private function generateDICOMJson($dicomFilePaths, $dicomFileNodes, $selectedFileFullPath, $parentFullPath, $currentUserPathToFile, $downloadUrlPrefix, $isPublic, $singlePublicFileDownload) {
$dicomJson = array('studies' => array());

foreach($dicomFilePaths as $dicomFilePath) {
foreach($dicomFilePaths as $index => $dicomFilePath) {
$fileUrlPath = '';
if ($isPublic) {
if ($singlePublicFileDownload) {
Expand All @@ -187,15 +197,42 @@ private function generateDICOMJson($dicomFilePaths, $selectedFileFullPath, $pare
$fileUrl = $this->urlGenerator->getAbsoluteURL($fileUrlPath);

$fileFullPath = $parentFullPath.$dicomFilePath;
$dicom = Nanodicom::factory($fileFullPath);

if (!$dicom->is_dicom()) {
// Do not parse if it is not a DICOM file
continue;
$dicom = null;
if ($this->isEncryptionEnabled() || !file_exists($fileFullPath)) {
// If encryption is enabled or file does not exist in local storage,
// need to get file content using File API
$dicomDecryptedContent = $dicomFileNodes[$index]->getContent();

try {
// Use a temp file for Nanodicom to read the DICOM file content
$stream = fopen('php://temp/maxmemory:1073741824', 'r+'); // 1 GB limit
fwrite($stream, $dicomDecryptedContent);
rewind($stream);
$tempFilePath = tempnam(sys_get_temp_dir(), 'dicom_'.uniqid());
file_put_contents($tempFilePath, stream_get_contents($stream));

$dicom = Nanodicom::factory($tempFilePath);
if (!$dicom || !$dicom->is_dicom()) {
// Do not parse if it is not a DICOM file
continue;
}
$dicom->parse()->profiler_diff('parse');
} catch (Exception $e) {
$this->logger->error('Failed to parse DICOM file: '.$dicomFileNodes[$index]->getPath());
} finally {
unlink($tempFilePath);
fclose($stream);
}
} else {
$dicom = Nanodicom::factory($fileFullPath);
if (!$dicom || !$dicom->is_dicom()) {
// Do not parse if it is not a DICOM file
continue;
}
$dicom->parse()->profiler_diff('parse');
}

$dicom->parse()->profiler_diff('parse');

$StudyInstanceUID = $this->cleanDICOMTagValue($dicom->value(0x0020, 0x000D));
$StudyDate = $this->cleanDICOMTagValue($dicom->value(0x0008, 0x0020));
$StudyTime = $this->cleanDICOMTagValue($dicom->value(0x0008, 0x0030));
Expand Down Expand Up @@ -478,11 +515,11 @@ public function getDICOMJson(): JSONResponse {
// Get all DICOM files in the folder and sub folders
$parentPathToRemove = '/'.$userId.'/files';
$dicomFolder = $file->getType() == 'dir' ? $file : $file->getParent();
$dicomFilePaths = $this->getAllDICOMFilesInFolder($parentPathToRemove, $dicomFolder, $isOpenNoExtension);
list($dicomFilePaths, $dicomFileNodes) = $this->getAllDICOMFilesInFolder($parentPathToRemove, $dicomFolder, $isOpenNoExtension);

$dicomParentFullPath = $this->dataFolder.'/'.$userId.'/files';
$downloadUrlPrefix = 'remote.php/dav/files/'.$currentUserId;
$dicomJson = $this->generateDICOMJson($dicomFilePaths, $selectedFileFullPath, $dicomParentFullPath, $currentUserPathToFile, $downloadUrlPrefix, false, false);
$dicomJson = $this->generateDICOMJson($dicomFilePaths, $dicomFileNodes, $selectedFileFullPath, $dicomParentFullPath, $currentUserPathToFile, $downloadUrlPrefix, false, false);
$dicomJson = $this->convertToUTF8($dicomJson);
$response = new JSONResponse($dicomJson);
return $response;
Expand All @@ -509,6 +546,7 @@ public function getPublicDICOMJson(): JSONResponse {
$selectedFileFullPath = '';
$dicomParentFullPath = '';
$dicomFilePaths = array();
$dicomFileNodes = array();
$singlePublicFileDownload = false;

$shareNode = $share->getNode();
Expand All @@ -518,18 +556,19 @@ public function getPublicDICOMJson(): JSONResponse {

// Get all DICOM files in the share folder and sub folders
$parentPathToRemove = $shareNode->getPath();
$dicomFilePaths = $this->getAllDICOMFilesInFolder($parentPathToRemove, $shareNode, false);
list($dicomFilePaths, $dicomFileNodes) = $this->getAllDICOMFilesInFolder($parentPathToRemove, $shareNode, false);
} else {
$selectedFileFullPath = null;
$dicomParentFullPath = $this->dataFolder;
$singlePublicFileDownload = true;

// Get only shared DICOM file
array_push($dicomFilePaths, $shareNode->getPath());
array_push($dicomFileNodes, $shareNode);
}

$downloadUrlPrefix = $this->getNextcloudBasePath().'/s/'.$shareToken.'/download';
$dicomJson = $this->generateDICOMJson($dicomFilePaths, $selectedFileFullPath, $dicomParentFullPath, null, $downloadUrlPrefix, true, $singlePublicFileDownload);
$dicomJson = $this->generateDICOMJson($dicomFilePaths, $dicomFileNodes, $selectedFileFullPath, $dicomParentFullPath, null, $downloadUrlPrefix, true, $singlePublicFileDownload);

$dicomJson = $this->convertToUTF8($dicomJson);
$response = new JSONResponse($dicomJson);
Expand Down

0 comments on commit d38f15f

Please sign in to comment.