Fixed minor bug with app sdkfor base64 encode/decode
This commit is contained in:
@@ -89,12 +89,18 @@ def md5_base64(a):
|
|||||||
@shuffle_filters.register
|
@shuffle_filters.register
|
||||||
def base64_encode(a):
|
def base64_encode(a):
|
||||||
a = str(a)
|
a = str(a)
|
||||||
return base64.b64encode(a.encode('utf-8')).decode()
|
try:
|
||||||
|
return base64.b64encode(a.encode('utf-8')).decode()
|
||||||
|
except:
|
||||||
|
return base64.b64encode(a).decode()
|
||||||
|
|
||||||
@shuffle_filters.register
|
@shuffle_filters.register
|
||||||
def base64_decode(a):
|
def base64_decode(a):
|
||||||
a = str(a)
|
a = str(a)
|
||||||
return base64.b64decode(a).decode()
|
try:
|
||||||
|
return base64.b64decode(a).decode()
|
||||||
|
except:
|
||||||
|
return base64.b64decode(a)
|
||||||
|
|
||||||
#print(standard_filter_manager.filters)
|
#print(standard_filter_manager.filters)
|
||||||
#print(shuffle_filters.filters)
|
#print(shuffle_filters.filters)
|
||||||
@@ -125,9 +131,6 @@ class AppBase:
|
|||||||
ch.setFormatter(formatter)
|
ch.setFormatter(formatter)
|
||||||
logger.addHandler(ch)
|
logger.addHandler(ch)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
self.redis=redis
|
self.redis=redis
|
||||||
self.console_logger = logger if logger is not None else logging.getLogger("AppBaseLogger")
|
self.console_logger = logger if logger is not None else logging.getLogger("AppBaseLogger")
|
||||||
|
|
||||||
@@ -1073,6 +1076,7 @@ class AppBase:
|
|||||||
#return value.json()
|
#return value.json()
|
||||||
return {"success": False}
|
return {"success": False}
|
||||||
|
|
||||||
|
# Wrapper for set_files
|
||||||
def set_file(self, infiles):
|
def set_file(self, infiles):
|
||||||
return self.set_files(infiles)
|
return self.set_files(infiles)
|
||||||
|
|
||||||
@@ -2136,7 +2140,11 @@ class AppBase:
|
|||||||
except:
|
except:
|
||||||
self.logger.info("Error in initial replacement of escaped dollar!")
|
self.logger.info("Error in initial replacement of escaped dollar!")
|
||||||
|
|
||||||
#self.logger.info("POST input value: %s" % parameter["value"])
|
# Basic fix in case variant isn't set
|
||||||
|
try:
|
||||||
|
self.logger.info("[DEBUG] Parameter variant: %s" % parameter["variant"])
|
||||||
|
except:
|
||||||
|
parameter["variant"] = "STATIC_VALUE"
|
||||||
|
|
||||||
# Regex to find all the things
|
# Regex to find all the things
|
||||||
if parameter["variant"] == "STATIC_VALUE":
|
if parameter["variant"] == "STATIC_VALUE":
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ module main
|
|||||||
|
|
||||||
go 1.16
|
go 1.16
|
||||||
|
|
||||||
//replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared
|
replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared
|
||||||
|
|
||||||
//replace github.com/frikky/kin-openapi => ../../../../git/kin-openapi
|
//replace github.com/frikky/kin-openapi => ../../../../git/kin-openapi
|
||||||
//replace github.com/frikky/go-elasticsearch => ../../../../git/go-elasticsearch
|
//replace github.com/frikky/go-elasticsearch => ../../../../git/go-elasticsearch
|
||||||
|
|||||||
Reference in New Issue
Block a user