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

Soft migrating to auth #309

Merged
merged 2 commits into from
Sep 27, 2023
Merged

Soft migrating to auth #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
870e2d5
Soft migrating to auth
Sep 26, 2023
28dce5e
Change message
Sep 27, 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
2 changes: 1 addition & 1 deletion src/main/kotlin/io/emeraldpay/dshackle/auth/AuthRpc.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class AuthRpc(
Mono.error(it)
} else {
val message = "Internal error: ${it.message}"
log.error(message, it)
log.error(message)
Mono.error(
Status.INTERNAL
.withDescription(message)
Expand Down
9 changes: 8 additions & 1 deletion src/main/kotlin/io/emeraldpay/dshackle/upstream/grpc/auth/GrpcUpstreamsAuth.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import io.emeraldpay.dshackle.auth.processor.SESSION_ID
import io.emeraldpay.dshackle.auth.processor.VERSION
import io.emeraldpay.dshackle.auth.service.RsaKeyReader
import io.emeraldpay.dshackle.config.AuthorizationConfig
import io.grpc.Status
import io.grpc.StatusRuntimeException
import reactor.core.publisher.Mono
import java.security.interfaces.RSAPrivateKey
import java.security.interfaces.RSAPublicKey
Expand All @@ -34,7 +36,12 @@ class GrpcUpstreamsAuth(
).map {
verify(it.providerToken, providerId)
}.onErrorResume {
Mono.just(AuthResult(false, "Error during auth - ${it.message}"))
if (it is StatusRuntimeException && it.status.code == Status.Code.UNIMPLEMENTED) {
Mono.just(AuthResult(true))
.also { grpcAuthContext.putTokenInContext(providerId, SESSION_ID) }
} else {
Mono.just(AuthResult(false, "Error during auth - ${it.message}"))
}
}
}

Expand Down
Loading