mirror of https://github.com/usbharu/Hideout.git
style: スタイルを調整
This commit is contained in:
parent
5b9618a277
commit
b21a02609d
|
@ -35,7 +35,6 @@ import java.security.interfaces.RSAPrivateKey
|
||||||
import java.security.interfaces.RSAPublicKey
|
import java.security.interfaces.RSAPublicKey
|
||||||
import java.util.*
|
import java.util.*
|
||||||
|
|
||||||
|
|
||||||
@EnableWebSecurity(debug = true)
|
@EnableWebSecurity(debug = true)
|
||||||
@Configuration
|
@Configuration
|
||||||
class SecurityConfig {
|
class SecurityConfig {
|
||||||
|
@ -152,8 +151,6 @@ class SecurityConfig {
|
||||||
if (OAuth2TokenType.ACCESS_TOKEN == context.tokenType) {
|
if (OAuth2TokenType.ACCESS_TOKEN == context.tokenType) {
|
||||||
val userDetailsImpl = context.getPrincipal<Authentication>().principal as UserDetailsImpl
|
val userDetailsImpl = context.getPrincipal<Authentication>().principal as UserDetailsImpl
|
||||||
context.claims.claim("uid", userDetailsImpl.id.toString())
|
context.claims.claim("uid", userDetailsImpl.id.toString())
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,5 +35,4 @@ class MastodonAppsApiController(private val appApiService: AppApiService) : AppA
|
||||||
HttpStatus.OK
|
HttpStatus.OK
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,8 +30,6 @@ class UserDetailsImpl(
|
||||||
@Serial
|
@Serial
|
||||||
private const val serialVersionUID: Long = -899168205656607781L
|
private const val serialVersionUID: Long = -899168205656607781L
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
|
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
|
||||||
|
@ -46,11 +44,9 @@ class UserDetailsImpl(
|
||||||
@JsonSubTypes
|
@JsonSubTypes
|
||||||
abstract class UserDetailsMixin
|
abstract class UserDetailsMixin
|
||||||
|
|
||||||
|
|
||||||
class UserDetailsDeserializer : JsonDeserializer<UserDetailsImpl>() {
|
class UserDetailsDeserializer : JsonDeserializer<UserDetailsImpl>() {
|
||||||
val SIMPLE_GRANTED_AUTHORITY_SET = object : TypeReference<Set<SimpleGrantedAuthority>>() {}
|
val SIMPLE_GRANTED_AUTHORITY_SET = object : TypeReference<Set<SimpleGrantedAuthority>>() {}
|
||||||
override fun deserialize(p: JsonParser, ctxt: DeserializationContext): UserDetailsImpl {
|
override fun deserialize(p: JsonParser, ctxt: DeserializationContext): UserDetailsImpl {
|
||||||
|
|
||||||
val mapper = p.codec as ObjectMapper
|
val mapper = p.codec as ObjectMapper
|
||||||
val jsonNode: JsonNode = mapper.readTree(p)
|
val jsonNode: JsonNode = mapper.readTree(p)
|
||||||
println(jsonNode)
|
println(jsonNode)
|
||||||
|
@ -70,7 +66,6 @@ class UserDetailsDeserializer : JsonDeserializer<UserDetailsImpl>() {
|
||||||
true,
|
true,
|
||||||
authorities.toMutableList(),
|
authorities.toMutableList(),
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun JsonNode.readText(field: String, defaultValue: String = ""): String {
|
fun JsonNode.readText(field: String, defaultValue: String = ""): String {
|
||||||
|
@ -79,5 +74,4 @@ class UserDetailsDeserializer : JsonDeserializer<UserDetailsImpl>() {
|
||||||
else -> defaultValue
|
else -> defaultValue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -175,7 +175,6 @@ class RegisteredClientRepositoryImpl(private val database: Database) : Registere
|
||||||
|
|
||||||
return builder.build()
|
return builder.build()
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// org/springframework/security/oauth2/server/authorization/client/oauth2-registered-client-schema.sql
|
// org/springframework/security/oauth2/server/authorization/client/oauth2-registered-client-schema.sql
|
||||||
|
|
|
@ -13,7 +13,6 @@ interface AccountApiService {
|
||||||
suspend fun verifyCredentials(userid: Long): CredentialAccount
|
suspend fun verifyCredentials(userid: Long): CredentialAccount
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
class AccountApiServiceImpl(private val accountService: AccountService, private val transaction: Transaction) :
|
class AccountApiServiceImpl(private val accountService: AccountService, private val transaction: Transaction) :
|
||||||
AccountApiService {
|
AccountApiService {
|
||||||
|
@ -59,5 +58,4 @@ class AccountApiServiceImpl(private val accountService: AccountService, private
|
||||||
role = Role(0, "Admin", "", 32)
|
role = Role(0, "Admin", "", 32)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,7 +18,6 @@ interface StatusesApiService {
|
||||||
suspend fun postStatus(statusesRequest: StatusesRequest, user: UserDetailsImpl): Status
|
suspend fun postStatus(statusesRequest: StatusesRequest, user: UserDetailsImpl): Status
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
class StatsesApiServiceImpl(
|
class StatsesApiServiceImpl(
|
||||||
private val postService: PostService,
|
private val postService: PostService,
|
||||||
|
@ -28,7 +27,6 @@ class StatsesApiServiceImpl(
|
||||||
) :
|
) :
|
||||||
StatusesApiService {
|
StatusesApiService {
|
||||||
override suspend fun postStatus(statusesRequest: StatusesRequest, user: UserDetailsImpl): Status {
|
override suspend fun postStatus(statusesRequest: StatusesRequest, user: UserDetailsImpl): Status {
|
||||||
|
|
||||||
val visibility = when (statusesRequest.visibility) {
|
val visibility = when (statusesRequest.visibility) {
|
||||||
StatusesRequest.Visibility.public -> Visibility.PUBLIC
|
StatusesRequest.Visibility.public -> Visibility.PUBLIC
|
||||||
StatusesRequest.Visibility.unlisted -> Visibility.UNLISTED
|
StatusesRequest.Visibility.unlisted -> Visibility.UNLISTED
|
||||||
|
@ -67,7 +65,6 @@ class StatsesApiServiceImpl(
|
||||||
null
|
null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return Status(
|
return Status(
|
||||||
id = post.id.toString(),
|
id = post.id.toString(),
|
||||||
uri = post.apId,
|
uri = post.apId,
|
||||||
|
|
|
@ -26,11 +26,9 @@ class ExposedOAuth2AuthorizationConsentService(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
override fun save(authorizationConsent: AuthorizationConsent?) = runBlocking {
|
override fun save(authorizationConsent: AuthorizationConsent?) = runBlocking {
|
||||||
requireNotNull(authorizationConsent)
|
requireNotNull(authorizationConsent)
|
||||||
transaction.transaction {
|
transaction.transaction {
|
||||||
|
|
||||||
val singleOrNull =
|
val singleOrNull =
|
||||||
OAuth2AuthorizationConsent.select {
|
OAuth2AuthorizationConsent.select {
|
||||||
OAuth2AuthorizationConsent.registeredClientId
|
OAuth2AuthorizationConsent.registeredClientId
|
||||||
|
@ -61,7 +59,6 @@ class ExposedOAuth2AuthorizationConsentService(
|
||||||
requireNotNull(registeredClientId)
|
requireNotNull(registeredClientId)
|
||||||
requireNotNull(principalName)
|
requireNotNull(principalName)
|
||||||
transaction.transaction {
|
transaction.transaction {
|
||||||
|
|
||||||
OAuth2AuthorizationConsent.select {
|
OAuth2AuthorizationConsent.select {
|
||||||
(OAuth2AuthorizationConsent.registeredClientId eq registeredClientId)
|
(OAuth2AuthorizationConsent.registeredClientId eq registeredClientId)
|
||||||
.and(OAuth2AuthorizationConsent.principalName eq principalName)
|
.and(OAuth2AuthorizationConsent.principalName eq principalName)
|
||||||
|
|
|
@ -151,8 +151,6 @@ class ExposedOAuth2AuthorizationService(
|
||||||
override fun findByToken(token: String?, tokenType: OAuth2TokenType?): OAuth2Authorization? = runBlocking {
|
override fun findByToken(token: String?, tokenType: OAuth2TokenType?): OAuth2Authorization? = runBlocking {
|
||||||
requireNotNull(token)
|
requireNotNull(token)
|
||||||
transaction.transaction {
|
transaction.transaction {
|
||||||
|
|
||||||
|
|
||||||
when (tokenType?.value) {
|
when (tokenType?.value) {
|
||||||
null -> {
|
null -> {
|
||||||
Authorization.select {
|
Authorization.select {
|
||||||
|
|
|
@ -7,12 +7,10 @@ import java.util.*
|
||||||
@Component
|
@Component
|
||||||
class SecureTokenGeneratorImpl : SecureTokenGenerator {
|
class SecureTokenGeneratorImpl : SecureTokenGenerator {
|
||||||
override fun generate(): String {
|
override fun generate(): String {
|
||||||
|
|
||||||
val byteArray = ByteArray(16)
|
val byteArray = ByteArray(16)
|
||||||
val secureRandom = SecureRandom()
|
val secureRandom = SecureRandom()
|
||||||
secureRandom.nextBytes(byteArray)
|
secureRandom.nextBytes(byteArray)
|
||||||
|
|
||||||
|
|
||||||
return Base64.getUrlEncoder().encodeToString(byteArray)
|
return Base64.getUrlEncoder().encodeToString(byteArray)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue