From e9a0b47e86b0d9313446015dd85d2cc52989af51 Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Wed, 26 Mar 2025 12:14:11 +0100
Subject: [PATCH] refs #1747 EjecutarScript: b64decode the param "scp"

---
 CHANGELOG.md                                         | 6 ++++++
 linux/debian/changelog                               | 6 ++++++
 src/VERSION                                          | 2 +-
 src/opengnsys/modules/server/ogAdmClient/__init__.py | 4 ++--
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62f3d93..a0fa329 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.0] - 2025-03-26
+
+### Changed
+
+- EjecutarScript/ConsolaRemota: expect "scp" parameter encoded in base64
+
 ## [1.7.1] - 2025-03-25
 
 ### Fixed
diff --git a/linux/debian/changelog b/linux/debian/changelog
index 790733c..4449a56 100644
--- a/linux/debian/changelog
+++ b/linux/debian/changelog
@@ -1,3 +1,9 @@
+ogagent (2.0.0-1) UNRELEASED; urgency=medium
+
+  * EjecutarScript/ConsolaRemota: expect "scp" parameter encoded in base64
+
+ -- OpenGnsys developers <info@opengnsys.es>  Wed, 26 Mar 2025 10:40:14 +0100
+
 ogagent (1.7.1-1) stable; urgency=medium
 
   * Make cfg2obj more robust
diff --git a/src/VERSION b/src/VERSION
index 943f9cb..227cea2 100644
--- a/src/VERSION
+++ b/src/VERSION
@@ -1 +1 @@
-1.7.1
+2.0.0
diff --git a/src/opengnsys/modules/server/ogAdmClient/__init__.py b/src/opengnsys/modules/server/ogAdmClient/__init__.py
index 589e2fb..4967ccc 100644
--- a/src/opengnsys/modules/server/ogAdmClient/__init__.py
+++ b/src/opengnsys/modules/server/ogAdmClient/__init__.py
@@ -625,7 +625,7 @@ class ogAdmClientWorker (ogLiveWorker):
                 return {}
 
         nfn = post_params['nfn']
-        scp = unquote (post_params['scp'])
+        scp = base64.b64decode (unquote (post_params['scp'])).decode ('utf-8')
         filescript = f'/tmp/_script_{self.IPlocal}'
         ecosrc = f'/tmp/_econsola_{self.IPlocal}'
         ecodst = f'/tmp/_Seconsola_{self.IPlocal}'    ## Nombre que tendra el archivo en el Servidor
@@ -720,7 +720,7 @@ class ogAdmClientWorker (ogLiveWorker):
                 return {}
 
         nfn = post_params['nfn']
-        scp = unquote (post_params['scp'])
+        scp = base64.b64decode (unquote (post_params['scp'])).decode ('utf-8')
         ids = post_params['ids']
 
         self.muestraMensaje (8)