StakeSquid/dshackle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Soft migrating to auth (#309)

Browse Source
This commit is contained in:
KirillPamPam
2023-09-27 14:32:01 +04:00
committed by GitHub
parent be97ba0aac
commit a2c5743fb2
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/io/emeraldpay/dshackle/auth/AuthRpc.kt
View File

@@ -35,7 +35,7 @@ class AuthRpc(
Mono.error(it) Mono.error(it)
} else { } else {
val message = "Internal error: ${it.message}" val message = "Internal error: ${it.message}"
log.error(message, it) log.error(message)
Mono.error( Mono.error(
Status.INTERNAL Status.INTERNAL
.withDescription(message) .withDescription(message)

9
src/main/kotlin/io/emeraldpay/dshackle/upstream/grpc/auth/GrpcUpstreamsAuth.kt
View File

@@ -10,6 +10,8 @@ import io.emeraldpay.dshackle.auth.processor.SESSION_ID
import io.emeraldpay.dshackle.auth.processor.VERSION import io.emeraldpay.dshackle.auth.processor.VERSION
import io.emeraldpay.dshackle.auth.service.RsaKeyReader import io.emeraldpay.dshackle.auth.service.RsaKeyReader
import io.emeraldpay.dshackle.config.AuthorizationConfig import io.emeraldpay.dshackle.config.AuthorizationConfig
import io.grpc.Status
import io.grpc.StatusRuntimeException
import reactor.core.publisher.Mono import reactor.core.publisher.Mono
import java.security.interfaces.RSAPrivateKey import java.security.interfaces.RSAPrivateKey
import java.security.interfaces.RSAPublicKey import java.security.interfaces.RSAPublicKey
@@ -34,7 +36,12 @@ class GrpcUpstreamsAuth(
).map { ).map {
verify(it.providerToken, providerId) verify(it.providerToken, providerId)
}.onErrorResume { }.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}"))
}
} }
} }