Skip to content

Commit

Permalink
Upstream update.
Browse files Browse the repository at this point in the history
  • Loading branch information
@noeppi-noeppi
noeppi-noeppi committed Aug 10, 2024
1 parent 3d96dfc commit 8e62260
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
26 changes: 13 additions & 13 deletions patches/0002-Implement-LDAP-only-authentication-and-permission-sy.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Implement LDAP-only authentication and permission sync.


diff --git a/reposilite-backend/src/main/kotlin/com/reposilite/auth/BasicAuthenticator.kt b/reposilite-backend/src/main/kotlin/com/reposilite/auth/BasicAuthenticator.kt
index 36a8bc9eed5c33c0f4defca0aaf905387d056226..da5c53fa7af05cd522512958559f18f25d223a36 100644
index a3fabdaaf38a69941c706bbec4d8c86368dc7900..fd1a9ccfb4af8415a6f84de501cc55448189fc95 100644
--- a/reposilite-backend/src/main/kotlin/com/reposilite/auth/BasicAuthenticator.kt
+++ b/reposilite-backend/src/main/kotlin/com/reposilite/auth/BasicAuthenticator.kt
@@ -17,14 +17,19 @@
Expand Down Expand Up @@ -36,10 +36,10 @@ index 36a8bc9eed5c33c0f4defca0aaf905387d056226..da5c53fa7af05cd522512958559f18f2
- true
+ basicSettings.map { it.enabled }

override fun realm(): String =
"Basic"
override fun priority(): Double =
0.0
diff --git a/reposilite-backend/src/main/kotlin/com/reposilite/auth/LdapAuthenticator.kt b/reposilite-backend/src/main/kotlin/com/reposilite/auth/LdapAuthenticator.kt
index c197f879b1e6191df6d8c9f80668393c9fc40177..7bcd376862f378853230f5f1fb98c898fe349324 100644
index 758340bc2f1561f54a4a22892e1b7254fbc59d99..f3b4b2d8325dff76052abce096c2b878fe27fa23 100644
--- a/reposilite-backend/src/main/kotlin/com/reposilite/auth/LdapAuthenticator.kt
+++ b/reposilite-backend/src/main/kotlin/com/reposilite/auth/LdapAuthenticator.kt
@@ -29,6 +29,9 @@ import com.reposilite.shared.notFoundError
Expand Down Expand Up @@ -134,10 +134,10 @@ index c197f879b1e6191df6d8c9f80668393c9fc40177..7bcd376862f378853230f5f1fb98c898
private fun createDirContext(user: String, password: String): Result<out DirContext, ErrorResponse> =
Hashtable<String, String>()
diff --git a/reposilite-backend/src/main/kotlin/com/reposilite/auth/application/AuthenticationComponents.kt b/reposilite-backend/src/main/kotlin/com/reposilite/auth/application/AuthenticationComponents.kt
index 5ece1c8db22bfb38150533a49e831a556fa99752..67d1261fc79966b45f5c3bdef67433324575a618 100644
index 0084f19ec228fd504b9efaf9e69bc0985047e3fa..9b7950f649f5644ddd04aa3f6771ed393a4b01d3 100644
--- a/reposilite-backend/src/main/kotlin/com/reposilite/auth/application/AuthenticationComponents.kt
+++ b/reposilite-backend/src/main/kotlin/com/reposilite/auth/application/AuthenticationComponents.kt
@@ -36,7 +36,8 @@ class AuthenticationComponents(
@@ -37,7 +37,8 @@ class AuthenticationComponents(
) : PluginComponents {

private fun basicAuthenticator(): BasicAuthenticator =
Expand Down Expand Up @@ -192,29 +192,29 @@ index 3df3f14168b2ba5e3f8b34394b6ff19afbbdf8b1..528c0f81362bb2a5401db30be92353be
+ val write: List<String> = listOf()
) : SharedSettings
diff --git a/reposilite-backend/src/test/kotlin/com/reposilite/auth/specification/AuthenticationSpecification.kt b/reposilite-backend/src/test/kotlin/com/reposilite/auth/specification/AuthenticationSpecification.kt
index 22cb6d4aea6c933d9cd0587a37823ca572452e51..2d01231053832a81d4849e64bbe0c4fa3a581a69 100644
index 382c58add4855366edf1fabb683e84b8bfe01979..ddaaa513fd24787b3c7dac3b09b27c20ec1cfc47 100644
--- a/reposilite-backend/src/test/kotlin/com/reposilite/auth/specification/AuthenticationSpecification.kt
+++ b/reposilite-backend/src/test/kotlin/com/reposilite/auth/specification/AuthenticationSpecification.kt
@@ -19,6 +19,7 @@ package com.reposilite.auth.specification
import com.reposilite.auth.AuthenticationFacade
@@ -20,6 +20,7 @@ import com.reposilite.auth.AuthenticationFacade
import com.reposilite.auth.Authenticator
import com.reposilite.auth.BasicAuthenticator
import com.reposilite.auth.LdapAuthenticator
+import com.reposilite.auth.application.BasicSettings
import com.reposilite.auth.application.LdapSettings
import com.reposilite.status.FailureFacade
import com.reposilite.token.specification.AccessTokenSpecification
@@ -28,6 +29,7 @@ import panda.std.reactive.toMutableReference
@@ -29,6 +30,7 @@ import panda.std.reactive.toMutableReference
internal abstract class AuthenticationSpecification : AccessTokenSpecification() {

protected val failureFacade = FailureFacade(logger)
+ protected val basicConfiguration = BasicSettings().toMutableReference()
protected val ldapConfiguration = LdapSettings().toMutableReference()

protected lateinit var authenticationFacade: AuthenticationFacade
@@ -37,7 +39,7 @@ internal abstract class AuthenticationSpecification : AccessTokenSpecification()
this.authenticationFacade = AuthenticationFacade(
@@ -39,7 +41,7 @@ internal abstract class AuthenticationSpecification : AccessTokenSpecification()
journalist = logger,
authenticators = listOf(
authenticators = sortedSetOf(
Authenticator.priorityComparator,
- BasicAuthenticator(accessTokenFacade),
+ BasicAuthenticator(accessTokenFacade, basicConfiguration),
LdapAuthenticator(
Expand Down
2 changes: 1 addition & 1 deletion upstream
Submodule upstream updated 45 files
+3 −3 build.gradle.kts
+13 −13 reposilite-backend/build.gradle.kts
+6 −1 reposilite-backend/src/main/kotlin/com/reposilite/auth/AuthenticationFacade.kt
+7 −0 reposilite-backend/src/main/kotlin/com/reposilite/auth/Authenticator.kt
+3 −0 reposilite-backend/src/main/kotlin/com/reposilite/auth/BasicAuthenticator.kt
+3 −0 reposilite-backend/src/main/kotlin/com/reposilite/auth/LdapAuthenticator.kt
+5 −3 reposilite-backend/src/main/kotlin/com/reposilite/auth/application/AuthenticationComponents.kt
+1 −0 reposilite-backend/src/main/kotlin/com/reposilite/maven/infrastructure/MavenEndpoints.kt
+1 −0 reposilite-backend/src/main/kotlin/com/reposilite/maven/infrastructure/MavenLatestApiEndpoints.kt
+7 −7 reposilite-backend/src/main/kotlin/com/reposilite/plugin/DependencyGraph.kt
+20 −4 reposilite-backend/src/main/kotlin/com/reposilite/shared/extensions/JavalinExtensions.kt
+18 −3 reposilite-backend/src/main/kotlin/com/reposilite/shared/http/HttpRemoteClient.kt
+6 −9 reposilite-backend/src/main/kotlin/com/reposilite/storage/api/FileDetails.kt
+20 −13 reposilite-backend/src/main/kotlin/com/reposilite/storage/filesystem/FileSystemStorageProvider.kt
+4 −3 reposilite-backend/src/main/kotlin/com/reposilite/storage/s3/S3StorageProvider.kt
+3 −1 reposilite-backend/src/test/kotlin/com/reposilite/auth/specification/AuthenticationSpecification.kt
+1 −1 reposilite-frontend/fake-api/fake-reposilite-backend.js
+1 −1 reposilite-frontend/index.html
+456 −544 reposilite-frontend/package-lock.json
+12 −12 reposilite-frontend/package.json
+1 −1 reposilite-frontend/src/App.vue
+7 −4 reposilite-frontend/src/components/browser/DetailedListEntry.vue
+1 −1 reposilite-frontend/src/components/dashboard/DashboardBox.vue
+1 −1 reposilite-frontend/src/components/dashboard/DashboardView.vue
+1 −1 reposilite-frontend/src/components/dashboard/InstanceStatusCharts.vue
+2 −2 reposilite-frontend/src/components/header/MenuPanel.vue
+28 −7 reposilite-frontend/src/pages/IndexPage.vue
+1 −1 reposilite-plugins/groovy-plugin/build.gradle.kts
+1 −1 reposilite-plugins/migration-plugin/build.gradle.kts
+7 −3 reposilite-plugins/prometheus-plugin/build.gradle.kts
+24 −22 reposilite-plugins/prometheus-plugin/src/main/kotlin/com/reposilite/plugin/prometheus/PrometheusFacade.kt
+67 −14 reposilite-plugins/prometheus-plugin/src/main/kotlin/com/reposilite/plugin/prometheus/PrometheusPlugin.kt
+0 −39 .../prometheus-plugin/src/main/kotlin/com/reposilite/plugin/prometheus/collectors/QueuedThreadPoolCollector.kt
+0 −88 ...prometheus-plugin/src/main/kotlin/com/reposilite/plugin/prometheus/collectors/StatisticsHandlerCollector.kt
+195 −0 reposilite-plugins/prometheus-plugin/src/main/kotlin/com/reposilite/plugin/prometheus/metrics/JettyMetrics.kt
+10 −0 reposilite-plugins/prometheus-plugin/src/main/kotlin/com/reposilite/plugin/prometheus/metrics/MetricsUtil.kt
+45 −0 ...ugins/prometheus-plugin/src/main/kotlin/com/reposilite/plugin/prometheus/metrics/QueuedThreadPoolMetrics.kt
+45 −0 ...ite-plugins/prometheus-plugin/src/main/kotlin/com/reposilite/plugin/prometheus/metrics/ReposiliteMetrics.kt
+20 −0 reposilite-plugins/prometheus-plugin/src/test/kotlin/com/reposilite/plugin/prometheus/PrometheusPluginTest.kt
+23 −0 ...heus-plugin/src/test/kotlin/com/reposilite/plugin/prometheus/specification/PrometheusPluginSpecification.kt
+1 −1 reposilite-plugins/swagger-plugin/build.gradle.kts
+5 −5 reposilite-site/data/guides/features/static-files.md
+3 −3 reposilite-site/data/guides/infrastructure/apache.md
+2 −2 reposilite-site/data/guides/infrastructure/systemd.md
+5 −5 reposilite-site/package.json

0 comments on commit 8e62260

Please sign in to comment.