AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-23 03:23:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed wrong implementation of Basic auth (#8779)

Browse Source 
* Fixed wrong implementation of Basic auth

+ added min length for passwords

* Fixed basic auth being compressed

+ added function to get auth header from settings
This commit is contained in:
Leonard Günther 2023-03-01 20:12:12 +01:00 committed by GitHub
parent 15c1998379
commit 50da1ee90a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/assets/jsons/translations/template.properties
View File

@ -614,6 +614,7 @@ File could not be found on the multiplayer server =
Unhandled problem, [errorMessage] =
Please enter your server password =
Set password =
Password must be at least 6 characters long =
Failed to set password! =
Password set successfully for server [serverURL] =
Password =

3
android/src/com/unciv/app/MultiplayerTurnCheckWorker.kt
View File

@ -24,7 +24,6 @@ import com.unciv.logic.files.UncivFiles
import com.unciv.logic.multiplayer.storage.FileStorageRateLimitReached
import com.unciv.logic.multiplayer.storage.OnlineMultiplayerFiles
import com.unciv.models.metadata.GameSettingsMultiplayer
import com.unciv.ui.screens.savescreens.Gzip
import kotlinx.coroutines.runBlocking
import java.io.FileNotFoundException
import java.io.PrintWriter
@ -216,7 +215,7 @@ class MultiplayerTurnCheckWorker(appContext: Context, workerParams: WorkerParame
Pair(USER_ID, settings.userId), Pair(CONFIGURED_DELAY, settings.turnCheckerDelay.seconds),
Pair(PERSISTENT_NOTIFICATION_ENABLED, settings.turnCheckerPersistentNotificationEnabled),
Pair(FILE_STORAGE, settings.server),
Pair(AUTH_HEADER, "Basic ${Gzip.zip(settings.userId)}:${Gzip.zip(settings.passwords[settings.server] ?: "")}"))
Pair(AUTH_HEADER, settings.getAuthHeader()))
if (settings.turnCheckerPersistentNotificationEnabled) {
showPersistentNotification(applicationContext, "—", settings.turnCheckerDelay)

5
core/src/com/unciv/logic/multiplayer/storage/OnlineMultiplayerFiles.kt
View File

@ -5,7 +5,6 @@ import com.unciv.UncivGame
import com.unciv.logic.GameInfo
import com.unciv.logic.GameInfoPreview
import com.unciv.logic.files.UncivFiles
import com.unciv.ui.screens.savescreens.Gzip
/**
* Allows access to games stored on a server for multiplayer purposes.
@ -26,9 +25,7 @@ class OnlineMultiplayerFiles(
val identifier = if (fileStorageIdentifier == null) UncivGame.Current.settings.multiplayer.server else fileStorageIdentifier
val authHeader = if (authenticationHeader == null) {
val settings = UncivGame.Current.settings.multiplayer
mapOf(
"Authorization" to "Basic ${Gzip.zip(settings.userId)}:${Gzip.zip(settings.passwords[settings.server] ?: "")}"
)
mapOf("Authorization" to settings.getAuthHeader())
} else {
authenticationHeader
}

4
core/src/com/unciv/logic/multiplayer/storage/UncivServerFileStorage.kt
View File

@ -1,6 +1,7 @@
package com.unciv.logic.multiplayer.storage
import com.badlogic.gdx.Net
import com.badlogic.gdx.utils.Base64Coder
import com.unciv.ui.screens.savescreens.Gzip
import com.unciv.utils.debug
import kotlin.Exception
@ -58,7 +59,8 @@ object UncivServerFileStorage : FileStorage {
override fun authenticate(userId: String, password: String): Boolean {
var authenticated = false
authHeader = mapOf("Authorization" to "Basic ${Gzip.zip(userId)}:${Gzip.zip(password)}")
val preEncodedAuthValue = "$userId:$password"
authHeader = mapOf("Authorization" to "Basic ${Base64Coder.encodeString(preEncodedAuthValue)}")
SimpleHttp.sendGetRequest("$serverUrl/auth", timeout=timeout, header=authHeader) {
success, result, code ->
if (!success) {

7
core/src/com/unciv/models/metadata/GameSettings.kt
View File

@ -2,6 +2,7 @@ package com.unciv.models.metadata
import com.badlogic.gdx.Application
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.utils.Base64Coder
import com.unciv.Constants
import com.unciv.UncivGame
import com.unciv.logic.multiplayer.FriendList
@ -233,6 +234,12 @@ class GameSettingsMultiplayer {
var currentGameTurnNotificationSound: UncivSound = UncivSound.Silent
var otherGameTurnNotificationSound: UncivSound = UncivSound.Silent
var hideDropboxWarning = false
fun getAuthHeader(): String {
val serverPassword = passwords[server] ?: ""
val preEncodedAuthValue = "$userId:$serverPassword"
return "Basic ${Base64Coder.encodeString(preEncodedAuthValue)}"
}
}
enum class GameSetting(

7
core/src/com/unciv/ui/popups/options/MultiplayerTab.kt
View File

@ -282,7 +282,7 @@ private fun successfullyConnectedToServer(action: (Boolean, Boolean) -> Unit) {
}
private fun setPassword(password: String, optionsPopup: OptionsPopup) {
if (password.isNullOrBlank())
if (password.isBlank())
return
val popup = Popup(optionsPopup.stageToShowOn).apply {
@ -290,6 +290,11 @@ private fun setPassword(password: String, optionsPopup: OptionsPopup) {
open(true)
}
if (password.length < 6) {
popup.reuseWith("Password must be at least 6 characters long", true)
return
}
if (UncivGame.Current.onlineMultiplayer.serverFeatureSet.authVersion == 0) {
popup.reuseWith("This server does not support authentication", true)
return