taler-android

Android apps for GNU Taler (wallet, PoS, cashier)
Log | Files | Refs | README | LICENSE

pos-config-url-percent-encodes-the-separator.diff (1300B)


      1 diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt
      2 index f50adf0b..5c5078cd 100644
      3 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt
      4 +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt
      5 @@ -335,9 +335,16 @@ class ConfigManager(
      6              try {
      7                  val url = when(val c = config) {
      8                      //is Config.Old -> c.configUrl
      9 +                    // Two segments, appended separately: appendPath() encodes
     10 +                    // a separator inside its argument, because a segment may
     11 +                    // legitimately contain one -- so "private/pos" became
     12 +                    // "private%2Fpos".  The backend decodes the path before
     13 +                    // routing and answered it anyway; a reverse proxy in front
     14 +                    // of it need not.
     15                      is Config.New -> c.merchantUrl.toUri()
     16                          .buildUpon()
     17 -                        .appendPath("private/pos")
     18 +                        .appendPath("private")
     19 +                        .appendPath("pos")
     20                          .build()
     21                          .toString()
     22                  }