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.

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

Support authentication for public / non-internal repositories #2876

Merged
merged 10 commits into from
Nov 14, 2023
Merged

Support authentication for public / non-internal repositories #2876

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c7e8877
added changes for global authentication
mehab Jul 6, 2023
0a47981
added default value for password in repository update part
mehab Jul 7, 2023
2a1a6e5
Merge branch 'DependencyTrack:master' into feature/addGlobalAuthentic…
mehab Nov 6, 2023
adc5895
pr review comments
mehab Nov 6, 2023
a47fd35
added changes for universal auth in repometaanalysistask
mehab Nov 8, 2023
56342dc
using authrequired field to set credentials
mehab Nov 8, 2023
991fe10
pr fixes
mehab Nov 8, 2023
8f3eba0
Update src/main/java/org/dependencytrack/tasks/repositories/Repositor…
mehab Nov 10, 2023
bdb7120
resolved merge conflicts
mehab Nov 14, 2023
d0191a7
Merge branch 'feature/addGlobalAuthentication' of https://github.com/…
mehab Nov 14, 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
Prev Previous commit
Next Next commit
added default value for password in repository update part 
Signed-off-by: mehab <[email protected]>
  • Loading branch information
@mehab
mehab committed Jul 7, 2023
commit 0a479815b1f15b038a645c10520d733d8a2bf877
6 changes: 4 additions & 2 deletions src/main/java/org/dependencytrack/resources/v1/RepositoryResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;

import static org.dependencytrack.resources.v1.AbstractConfigPropertyResource.ENCRYPTED_PLACEHOLDER;

/**
* JAX-RS resources for processing repositories.
*
Expand Down Expand Up @@ -202,8 +204,8 @@ public Response updateRepository(Repository jsonRepository) {
if (repository != null) {
final String url = StringUtils.trimToNull(jsonRepository.getUrl());
try {
// The password is not passed to the front-end, so it should only be overwritten if it is not null.
final String updatedPassword = jsonRepository.getPassword() != null
// The password is not passed to the front-end, so it should only be overwritten if it is not null or not set to default value coming from ui
final String updatedPassword = jsonRepository.getPassword()!=null && !jsonRepository.getPassword().equals(ENCRYPTED_PLACEHOLDER)
? DataEncryption.encryptAsString(jsonRepository.getPassword())
: repository.getPassword();

Expand Down