Skip to content

UFAL/download-bitstreams-as-separated-api-calling #969

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Sep 25, 2025
Merged

UFAL/download-bitstreams-as-separated-api-calling #969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c1b3493
added missing prefix
Paurikova2 Sep 9, 2025
3a83eaf
security: harden namespace handling in legacy bitstream redirect guard
Paurikova2 Sep 9, 2025
40437e9
harden legacy bitstream redirect namespace
Paurikova2 Sep 9, 2025
0f240e6
removed security control
Paurikova2 Sep 9, 2025
62b74ce
modified curl, download bitstreams based on the name as separeated ap…
Paurikova2 Sep 9, 2025
f29708d
remove -k argument from curl
Paurikova2 Sep 10, 2025
d03e3e5
removed debug console
Paurikova2 Sep 10, 2025
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
6 changes: 5 additions & 1 deletion src/app/bitstream-page/legacy-bitstream-url-redirect.guard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';

import { APP_CONFIG, AppConfig } from '../../config/app-config.interface';
import { PAGE_NOT_FOUND_PATH } from '../app-routing-paths';
import { BitstreamDataService } from '../core/data/bitstream-data.service';
import { RemoteData } from '../core/data/remote-data';
Expand All @@ -30,6 +31,7 @@ export const legacyBitstreamURLRedirectGuard: CanActivateFn = (
bitstreamDataService: BitstreamDataService = inject(BitstreamDataService),
serverHardRedirectService: HardRedirectService = inject(HardRedirectService),
router: Router = inject(Router),
appConfig: AppConfig = inject(APP_CONFIG),
): Observable<UrlTree | boolean> => {
const prefix = route.params.prefix;
const suffix = route.params.suffix;
Expand All @@ -46,7 +48,9 @@ export const legacyBitstreamURLRedirectGuard: CanActivateFn = (
getFirstCompletedRemoteData(),
map((rd: RemoteData<Bitstream>) => {
if (rd.hasSucceeded && !rd.hasNoContent) {
serverHardRedirectService.redirect(new URL(`/bitstreams/${rd.payload.uuid}/download`, serverHardRedirectService.getCurrentOrigin()).href, 301);
const nameSpace = appConfig.ui.nameSpace?.replace(/\/$/, '') || '';
const redirectUrl = new URL(nameSpace + `/bitstreams/${rd.payload.uuid}/download`, serverHardRedirectService.getCurrentOrigin()).href;
serverHardRedirectService.redirect(redirectUrl, 301);
return false;
} else {
return router.createUrlTree([PAGE_NOT_FOUND_PATH]);
Expand Down
6 changes: 4 additions & 2 deletions src/app/item-page/clarin-files-section/clarin-files-section.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,10 @@ export class ClarinFilesSectionComponent implements OnInit {
return file.name;
});

const url = `${this.halService.getRootHref()}/core/items/${this.item.id}/allzip?handleId=${this.itemHandle}`;
this.command = `curl -o "allzip.zip" "${url}"`;
// Generate curl command for individual bitstream downloads
const baseUrl = `${this.halService.getRootHref()}/bitstream/${this.itemHandle}`;
const fileNamesFormatted = fileNames.map((fileName, index) => `/${index}/${fileName}`).join(',');
this.command = `curl -O ${baseUrl}{${fileNamesFormatted}}`;
}

loadDownloadZipConfigProperties() {
Expand Down
Loading