Skip to content

Improve Password-protected messages compliance #2911

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

Merged
DenBond7 merged 2 commits into from
Dec 18, 2024
Merged

Improve Password-protected messages compliance #2911

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
9cd5443
wip
DenBond7 Dec 18, 2024
7ad97f1
Updated tests
DenBond7 Dec 18, 2024
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
18 changes: 18 additions & 0 deletions ...il/ui/gmailapi/passwordprotected/BaseComposeScreenPasswordProtectedDisallowedTermsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,17 @@ open class BaseComposeScreenPasswordProtectedDisallowedTermsTest(
"aaaa[Classification: Data Control: Internal Data Control]bbb",
"[droid]",
"check -droid- case",
"TEST-FEATURE",
"[test-feature}",
"before {test-feature}",
"[test-feature] after",
"before [test-feature} after",
"test-feature",
"test-feature after",
"before test-feature",
"before test-feature after",
"before TEST-feature after",
"before {TEST-feature} after"
)

val NON_MATCHING_SUBJECTS = listOf(
Expand All @@ -94,13 +105,20 @@ open class BaseComposeScreenPasswordProtectedDisallowedTermsTest(
"[1Classification: Data Control: Internal Data Control]",
"aaaa[1Classification: Data Control: Internal Data Control]bbb",
"Microdroid androids",
"beforetest-feature",
"test-featureafter",
"beforetest-featureafter",
"before {TEST-feature}after",
"before{TEST-feature} after",
"before{TEST-feature}after"
)

const val ERROR_TEXT =
"Password-protected messages are disabled, please check $URL"

val TERMS = listOf(
"droid",
"test-feature",
"[Classification: Data Control: Internal Data Control]",
)
}
Expand Down
4 changes: 3 additions & 1 deletion ...il/ui/gmailapi/passwordprotected/ComposeScreenPasswordProtectedDisallowedTermsFlowTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import org.junit.Test
import org.junit.rules.RuleChain
import org.junit.rules.TestRule
import org.junit.runner.RunWith
import java.util.concurrent.TimeUnit

/**
* @author Denys Bondarenko
Expand Down Expand Up @@ -76,6 +77,8 @@ class ComposeScreenPasswordProtectedDisallowedTermsFlowTest :
onView(withId(R.id.editTextEmailSubject))
.perform(scrollTo(), click(), replaceText(subject))

waitForObjectWithText(subject, TimeUnit.SECONDS.toMillis(5))

onView(withId(R.id.menuActionSend))
.check(matches(isDisplayed()))
.perform(click())
Expand All @@ -95,7 +98,6 @@ class ComposeScreenPasswordProtectedDisallowedTermsFlowTest :
.perform(openLinkWithText(URL))
//asserting our expected intent was recorded
Intents.intended(expectingIntent)
Thread.sleep(1000)
Intents.release()

onView(withId(android.R.id.button1))
Expand Down
6 changes: 3 additions & 3 deletions ...rypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/ClientConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,18 +226,18 @@ data class ClientConfiguration(
}

fun getDisallowPasswordMessagesForTermsRegex(): Regex? {
val startAndEntWithAnyNonWordCharacterRegex = "^\\W.*\\W\$".toRegex(RegexOption.IGNORE_CASE)
val startAndEndWithAnyNonWordCharacterRegex = "^\\W.*\\W\$".toRegex(RegexOption.IGNORE_CASE)

return disallowPasswordMessagesForTerms?.joinToString(
separator = "|",
prefix = "(",
postfix = ")"
) { term ->
val escapedTerm = Regex.escape(term)
if (startAndEntWithAnyNonWordCharacterRegex.matches(term)) {
if (startAndEndWithAnyNonWordCharacterRegex.matches(term)) {
"($escapedTerm)"
} else {
"(\\W$escapedTerm\\W)"
"(((^|\\s)+[^\\sa-zA-Z0-9_]$escapedTerm[^\\sa-zA-Z0-9_](\$|\\s)+)|((^|\\s)+$escapedTerm(\$|\\s)+))"
}
}?.toRegex(setOf(RegexOption.IGNORE_CASE))
}
Expand Down
19 changes: 19 additions & 0 deletions .../src/test/java/com/flowcrypt/email/api/retrofit/response/model/ClientConfigurationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,13 @@ class ClientConfigurationTest {
val clientConfiguration = ClientConfiguration(
disallowPasswordMessagesForTerms = listOf(
"droid",
"test-feature",
"[Classification: Data Control: Internal Data Control]",
)
)

val regex = requireNotNull(clientConfiguration.getDisallowPasswordMessagesForTermsRegex())
println(regex)

val matchingSubjects = listOf(
"[Classification: Data Control: Internal Data Control] Quarter results",
Expand All @@ -31,6 +33,17 @@ class ClientConfigurationTest {
"aaaa[Classification: Data Control: Internal Data Control]bbb",
"[droid]",
"check -droid- case",
"TEST-FEATURE",
"[test-feature}",
"before {test-feature}",
"[test-feature] after",
"before [test-feature} after",
"test-feature",
"test-feature after",
"before test-feature",
"before test-feature after",
"before TEST-feature after",
"before {TEST-feature} after"
)

val nonMatchingSubjects = listOf(
Expand All @@ -39,6 +52,12 @@ class ClientConfigurationTest {
"[1Classification: Data Control: Internal Data Control]",
"aaaa[1Classification: Data Control: Internal Data Control]bbb",
"Microdroid androids",
"beforetest-feature",
"test-featureafter",
"beforetest-featureafter",
"before {TEST-feature}after",
"before{TEST-feature} after",
"before{TEST-feature}after"
)
matchingSubjects.forEach { subject ->
assertNotNull("Exception in :$subject", regex.find(subject))
Expand Down
Loading