jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed checking of account's SIP URI userpart

Browse Source
This commit is contained in:
Juha Heinanen
2019-02-05 07:11:23 +02:00
parent f17f2e71df
commit 76a796720d
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/Utils.kt
+2 -6
View File
@@ -129,10 +129,6 @@ object Utils {
return aor.substringAfter("@") return aor.substringAfter("@")
} }
fun checkUserID(id: String): Boolean {
return Regex("^[a-zA-Z]([._-]|[a-zA-Z0-9]){1,49}\$").matches(id)
}
fun checkTelNo(no: String): Boolean { fun checkTelNo(no: String): Boolean {
return Regex("^[+]?[0-9]{1,16}\$").matches(no) return Regex("^[+]?[0-9]{1,16}\$").matches(no)
} }
@@ -144,7 +140,7 @@ object Utils {
fun checkUriUser(user: String): Boolean { fun checkUriUser(user: String): Boolean {
for (c in user) for (c in user)
if (!(c.isLetterOrDigit() || c in "-_.!~*'()&=+$,;?/")) return false if (!(c.isLetterOrDigit() || c in "-_.!~*'()&=+$,;?/")) return false
return true return user.length > 0
} }
fun checkDomain(domain: String): Boolean { fun checkDomain(domain: String): Boolean {
@@ -210,7 +206,7 @@ object Utils {
if (!uri.startsWith("sip:")) return false if (!uri.startsWith("sip:")) return false
val userDomain = uri.replace("sip:", "").split("@") val userDomain = uri.replace("sip:", "").split("@")
if (userDomain.size != 2) return false if (userDomain.size != 2) return false
if (!checkUserID(userDomain[0]) && !checkTelNo(userDomain[0])) return false if (!checkUriUser(userDomain[0])) return false
return checkDomain(userDomain[1]) || checkIP(userDomain[1]) return checkDomain(userDomain[1]) || checkIP(userDomain[1])
} }