DC/dc-project
1
1
Fork 0
Code Issues 25 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

#42 Improve VoteVoter

Browse Source
This commit is contained in:
Fabrice Lecomte
2020-03-17 15:48:59 +01:00
parent 4b96080051
commit cf2881c890
5 changed files with 108 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/kotlin/fr/dcproject/security/voter/ArticleVoter.kt
View File

@@ -2,7 +2,6 @@ package fr.dcproject.security.voter
import fr.dcproject.entity.ArticleAuthI
import fr.dcproject.entity.ArticleI
import fr.dcproject.entity.ArticleSimpleI
import fr.dcproject.entity.UserI
import io.ktor.application.ApplicationCall
import fr.dcproject.entity.Comment as CommentEntity
@@ -27,7 +26,7 @@ class ArticleVoter : Voter {
if (action == Action.VIEW) return view(subject, user)
if (action == Action.DELETE) return delete(subject, user)
if (action == Action.UPDATE) return update(subject, user)
if (action is CommentVoter.Action) return voteForComment(action)
if (action is CommentVoter.Action) return voteForComment(action, subject)
if (action is VoteVoter.Action) return voteForVote(action, subject)
if (action is Action) return Vote.DENIED
@@ -67,23 +66,36 @@ class ArticleVoter : Voter {
private fun voteForVote(action: VoteVoter.Action, subject: Any?): Vote {
if (action == VoteVoter.Action.CREATE && subject is VoteEntity<*>) {
val target = subject.target
if (target !is ArticleSimpleI) {
return Vote.ABSTAIN
}
if (target.isDeleted()) {
if (target is ArticleAuthI<*>) {
if (target.isDeleted()) {
return Vote.DENIED
}
} else if (target is ArticleI) {
return Vote.DENIED
}
}
return Vote.ABSTAIN
}
private fun voteForComment(action: CommentVoter.Action): Vote {
if (action == CommentVoter.Action.CREATE) {
return Vote.GRANTED
}
private fun voteForComment(action: CommentVoter.Action, subject: Any?): Vote {
if (subject is CommentEntity<*>) {
val target = subject.target
if (target is ArticleAuthI<*>) {
if (target.isDeleted()) {
return Vote.DENIED
}
} else if (target is ArticleI) {
return Vote.DENIED
}
if (action == CommentVoter.Action.CREATE) {
return Vote.GRANTED
}
if (action == CommentVoter.Action.VIEW) {
return Vote.GRANTED
if (action == CommentVoter.Action.VIEW) {
return Vote.GRANTED
}
} else {
return Vote.DENIED
}
return Vote.ABSTAIN

2
src/main/kotlin/fr/dcproject/security/voter/CommentVoter.kt
View File

@@ -19,7 +19,7 @@ class CommentVoter : Voter {
override fun vote(action: ActionI, call: ApplicationCall, subject: Any?): Vote {
val user = call.user
if (subject !is Comment<*> ) {
if (subject !is Comment<*>) {
return Vote.DENIED
}

10
src/main/kotlin/fr/dcproject/security/voter/ConstitutionVoter.kt
View File

@@ -16,7 +16,7 @@ class ConstitutionVoter : Voter {
override fun supports(action: ActionI, call: ApplicationCall, subject: Any?): Boolean {
return (action is Action || action is CommentVoter.Action || action is VoteVoter.Action)
.and(subject is List<*> || subject is ConstitutionSimple<*, *>? || subject is VoteEntity<*> || subject is Comment<*>)
.and(subject is ConstitutionSimple<*, *>? || subject is VoteEntity<*> || subject is Comment<*>)
}
override fun vote(action: ActionI, call: ApplicationCall, subject: Any?): Vote {
@@ -30,14 +30,6 @@ class ConstitutionVoter : Voter {
return if (subject.isDeleted()) Vote.DENIED
else Vote.GRANTED
}
if (subject is List<*>) {
subject.forEach {
if (it !is ConstitutionSimple<*, *> || it.isDeleted()) {
return Vote.DENIED
}
}
return Vote.GRANTED
}
return Vote.DENIED
}

39
src/test/kotlin/fr/dcproject/security/voter/CommentVoterTest.kt
View File

@@ -48,6 +48,23 @@ internal class CommentVoterTest {
target = article1
)
private val commentTargetDeleted = Comment(
content = "Hello",
createdBy = tesla,
target = Article(
content = "Hi",
createdBy = einstein,
description = "blablabla",
title = "Super article"
).apply { deletedAt = DateTime.now() }
)
private val commentTargetNoUser = Comment(
content = "Hello",
createdBy = tesla,
target = ArticleRef()
)
init {
mockkStatic("fr.dcproject.security.voter.VoterKt")
}
@@ -65,7 +82,7 @@ internal class CommentVoterTest {
}
@Test
fun `can be view the comment`() = listOf(CommentVoter()).run {
fun `can be view the comment`() = listOf(CommentVoter(), ArticleVoter()).run {
mockk<ApplicationCall> {
every { user } returns tesla.user
}.let {
@@ -110,7 +127,7 @@ internal class CommentVoterTest {
}
@Test
fun `can be create a comment`() = listOf(CommentVoter()).run {
fun `can be create a comment`() = listOf(CommentVoter(), ArticleVoter()).run {
mockk<ApplicationCall> {
every { user } returns tesla.user
}.let {
@@ -118,6 +135,24 @@ internal class CommentVoterTest {
}
}
@Test
fun `can not be create a comment if target is deleted`() = listOf(CommentVoter(), ArticleVoter()).run {
mockk<ApplicationCall> {
every { user } returns tesla.user
}.let {
can(CommentVoter.Action.CREATE, it, commentTargetDeleted) `should be` false
}
}
@Test
fun `can not be create a comment if target has no user`() = listOf(CommentVoter(), ArticleVoter()).run {
mockk<ApplicationCall> {
every { user } returns tesla.user
}.let {
can(CommentVoter.Action.CREATE, it, commentTargetNoUser) `should be` false
}
}
@Test
fun `can not be create a comment with other creator`() = listOf(CommentVoter()).run {
mockk<ApplicationCall> {

46
src/test/kotlin/fr/dcproject/security/voter/VoteVoterTest.kt
View File

@@ -52,6 +52,23 @@ internal class VoteVoterTest {
note = 1
)
private val voteOnDeleted = VoteEntity(
createdBy = tesla,
target = Article(
content = "Hi",
createdBy = einstein,
description = "blablabla",
title = "Super article"
).apply { deletedAt = DateTime.now() },
note = 1
)
private val voteWithoutUser = VoteEntity(
createdBy = tesla,
target = ArticleRef(),
note = 1
)
init {
mockkStatic("fr.dcproject.security.voter.VoterKt")
}
@@ -105,7 +122,7 @@ internal class VoteVoterTest {
}
@Test
fun `can be vote an article`() = listOf(VoteVoter()).run {
fun `can be vote an article`() = listOf(VoteVoter(), ArticleVoter()).run {
mockk<ApplicationCall> {
every { user } returns tesla.user
}.let {
@@ -121,4 +138,31 @@ internal class VoteVoterTest {
can(VoteVoter.Action.CREATE, it, vote1) `should be` false
}
}
@Test
fun `can not be vote an article if article is deleted`() = listOf(VoteVoter(), ArticleVoter()).run {
mockk<ApplicationCall> {
every { user } returns tesla.user
}.let {
can(VoteVoter.Action.CREATE, it, voteOnDeleted) `should be` false
}
}
@Test
fun `can not be vote an article if article have no user`() = listOf(VoteVoter(), ArticleVoter()).run {
mockk<ApplicationCall> {
every { user } returns tesla.user
}.let {
can(VoteVoter.Action.CREATE, it, voteWithoutUser) `should be` false
}
}
@Test
fun `can not be comment an article if article is deleted`() = listOf(VoteVoter(), ArticleVoter()).run {
mockk<ApplicationCall> {
every { user } returns tesla.user
}.let {
can(CommentVoter.Action.CREATE, it, voteOnDeleted) `should be` false
}
}
}