Skip to content

fix(Gradle): fix credentials checking in recent gradle releases #11887

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

Closed
losmateusz1 wants to merge 1 commit into from
Closed

fix(Gradle): fix credentials checking in recent gradle releases #11887

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 plugins/package-managers/gradle-plugin/src/main/kotlin/GradleModelExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import org.gradle.api.artifacts.Configuration
import org.gradle.api.artifacts.dsl.RepositoryHandler
import org.gradle.api.artifacts.repositories.ArtifactRepository
import org.gradle.api.artifacts.repositories.AuthenticationSupported
import org.gradle.api.artifacts.repositories.PasswordCredentials
import org.gradle.api.artifacts.repositories.UrlArtifactRepository
import org.gradle.api.attributes.AttributeContainer
import org.gradle.internal.deprecation.DeprecatableConfiguration
Expand Down Expand Up @@ -71,7 +72,10 @@ internal fun RepositoryHandler.associateNamesWithUrlsTo(repositories: MutableMap
* Convert this [UrlArtifactRepository] to an [OrtRepository] by extracting the relevant properties.
*/
internal fun UrlArtifactRepository.toOrtRepository(): OrtRepository {
val credentials = (this as? AuthenticationSupported)?.credentials
val credentials = (this as? AuthenticationSupported)?.let { authSupported ->
runCatching { authSupported.getCredentials(PasswordCredentials::class.java) }.getOrNull()
Copy link
Copy Markdown
Member

@sschuberth sschuberth May 27, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm. The original (parameter-less) getCredentials() function is still there (and Kotlin maps the getter to a property), so I'm unsure why this change should be needed.

Copy link
Copy Markdown
Contributor Author

@losmateusz1 losmateusz1 May 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the difference is that I used getCredentials(Class) instead of getCredentials(), I am not sure yet why gradle 8.14 fails on that, it may be because of the configuration of the project that I am currently checking

I will look into it some more, for now I don't see a better solution, I've run some tests and this approach will also work with older gradle releases

Copy link
Copy Markdown
Contributor Author

@losmateusz1 losmateusz1 Jun 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sschuberth the problem in my case was that there was a settings.gradle defined with HttpHeaderAuthentication that I missed, which made me thinking that there is an issue with parsing PasswordCredentials, I started working on a proper fix here #11927

Copy link
Copy Markdown
Member

@sschuberth sschuberth Jun 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, should we close this PR already in favor of that other PR?

}
Comment thread
github-advanced-security[bot] marked this conversation as resolved.
Fixed

return OrtRepositoryImpl(
url = url.toString(),
username = credentials?.username,
Expand Down
Loading