Merge pull request #203 from sasjs/invisibles

fix: support SOH, STX and DC1 control characters in mp_jsonout
fix: more invisibles
2025-12-29 21:50:05 +00:00 · 2022-03-29 12:02:09 +03:00 · 2022-03-28 16:26:58 +01:00 · 2022-03-28 15:54:28 +01:00 · 2022-03-21 18:10:56 +02:00 · 2022-03-21 16:07:27 +00:00
7 changed files with 127 additions and 49 deletions
--- a/all.sas
+++ b/all.sas
@@ -2194,7 +2194,7 @@ Usage:
  %end;

  /* Stored Process Server web app context */
-  %if %symexist(_metaport)
+  %if %symexist(_METAFOLDER)
    or "&SYSPROCESSNAME "="Compute Server "
    or &mode=INCLUDE
  %then %do;
@@ -2270,12 +2270,14 @@ Usage:
    /* send response in SASjs JSON format */
    data _null_;
      file _webout mod lrecl=32000 encoding='utf-8';
-      length msg $32767 ;
+      length msg syswarningtext syserrortext $32767 ;
      sasdatetime=datetime();
      msg=symget('msg');
    %if &logline>0 %then %do;
      msg=cats(msg,'\n\nLog Extract:\n',symget('logmsg'));
    %end;
+      /* escape the escapes */
+      msg=tranwrd(msg,'\','\\');
      /* escape the quotes */
      msg=tranwrd(msg,'"','\"');
      /* ditch the CRLFs as chrome complains */
@@ -8415,8 +8417,15 @@ options
                    prxchange('s/'!!'0A'x!!'/\n/',-1,
                    prxchange('s/'!!'0D'x!!'/\r/',-1,
                    prxchange('s/'!!'09'x!!'/\t/',-1,
+                    prxchange('s/'!!'00'x!!'/\\u0000/',-1, /* NUL */
+                    prxchange('s/'!!'0E'x!!'/\\u000E/',-1, /* SS  */
+                    prxchange('s/'!!'0F'x!!'/\\u000F/',-1, /* SF  */
+                    prxchange('s/'!!'01'x!!'/\\u0001/',-1, /* SOH */
+                    prxchange('s/'!!'02'x!!'/\\u0002/',-1, /* STX */
+                    prxchange('s/'!!'02'x!!'/\\u0010/',-1, /* DLE */
+                    prxchange('s/'!!'11'x!!'/\\u0011/',-1, /* DC1 */
                    prxchange('s/\\/\\\\/',-1,&&name&i)
-        )))))!!'"';
+        ))))))))))))!!'"';
      %end;
    %end;
    run;
@@ -13358,8 +13367,8 @@ run;
  <h4> SAS Macros </h4>
  @li mp_abort.sas

-  @param libref the libref (not name) of the metadata library
-  @param mAbort= If not assigned, HARD will call %mp_abort(), SOFT will
+  @param [in] libref The libref (not name) of the metadata library
+  @param [in] mAbort= If not assigned, HARD will call %mp_abort(), SOFT will
    silently return

  @returns libname statement
@@ -13373,11 +13382,11 @@ run;
    libref
    ,mAbort=HARD
 )/*/STORE SOURCE*/;
-
+%local mp_abort msg;
+%let mp_abort=0;
 %if %sysfunc(libref(&libref)) %then %do;
-  %local mp_abort msg; %let mp_abort=0;
  data _null_;
-    length liburi LibName $200;
+    length liburi LibName msg $200;
    call missing(of _all_);
    nobj=metadata_getnobj("omsobj:SASLibrary?@Libref='&libref'",1,liburi);
    if nobj=1 then do;
@@ -13391,7 +13400,24 @@ run;
          * not always helpful though.  One example, previously received:
          * NOTE: Libref XX refers to the same library metadata as libref XX.
          */
-        call symputx('msg',sysmsg(),'l');
+        msg=sysmsg();
+        if msg=:'ERROR: Libref SAVE is not assigned.' then do;
+          msg=catx(" ",
+            "Could not assign %upcase(&libref).",
+            "Please check metadata permissions!  Libname:",libname,
+            "Liburi:",liburi
+          );
+        end;
+        else if msg="ERROR: User does not have appropriate authorization "!!
+          "level for library SAVE."
+        then do;
+          msg=catx(" ",
+            "ERROR: User does not have appropriate authorization level",
+            "for library %upcase(&libref), libname:",libname,
+            "Liburi:",liburi
+          );
+        end;
+        call symputx('msg',msg,'l');
        if "&mabort"='HARD' then call symputx('mp_abort',1,'l');
      end;
      else do;
@@ -13410,22 +13436,18 @@ run;
    end;
  run;

-  %if &mp_abort=1 %then %do;
-    %mp_abort(iftrue= (&mp_abort=1)
-      ,mac=mm_assignlib.sas
-      ,msg=&msg
-    )
-    %return;
-  %end;
-  %else %if %length(&msg)>2 %then %do;
-    %put NOTE: &msg;
-    %return;
-  %end;
+  %put NOTE: &msg;

 %end;
 %else %do;
  %put NOTE: Library &libref is already assigned;
 %end;
+
+%mp_abort(iftrue= (&mp_abort=1)
+  ,mac=mm_assignlib.sas
+  ,msg=%superq(msg)
+)
+
 %mend mm_assignlib;
 /**
  @file
@@ -14912,8 +14934,15 @@ data _null_;
  put '                    prxchange(''s/''!!''0A''x!!''/\n/'',-1, ';
  put '                    prxchange(''s/''!!''0D''x!!''/\r/'',-1, ';
  put '                    prxchange(''s/''!!''09''x!!''/\t/'',-1, ';
+  put '                    prxchange(''s/''!!''00''x!!''/\\u0000/'',-1, /* NUL */ ';
+  put '                    prxchange(''s/''!!''0E''x!!''/\\u000E/'',-1, /* SS  */ ';
+  put '                    prxchange(''s/''!!''0F''x!!''/\\u000F/'',-1, /* SF  */ ';
+  put '                    prxchange(''s/''!!''01''x!!''/\\u0001/'',-1, /* SOH */ ';
+  put '                    prxchange(''s/''!!''02''x!!''/\\u0002/'',-1, /* STX */ ';
+  put '                    prxchange(''s/''!!''02''x!!''/\\u0010/'',-1, /* DLE */ ';
+  put '                    prxchange(''s/''!!''11''x!!''/\\u0011/'',-1, /* DC1 */ ';
  put '                    prxchange(''s/\\/\\\\/'',-1,&&name&i) ';
-  put '        )))))!!''"''; ';
+  put '        ))))))))))))!!''"''; ';
  put '      %end; ';
  put '    %end; ';
  put '    run; ';
@@ -20373,8 +20402,15 @@ data _null_;
  put '                    prxchange(''s/''!!''0A''x!!''/\n/'',-1, ';
  put '                    prxchange(''s/''!!''0D''x!!''/\r/'',-1, ';
  put '                    prxchange(''s/''!!''09''x!!''/\t/'',-1, ';
+  put '                    prxchange(''s/''!!''00''x!!''/\\u0000/'',-1, /* NUL */ ';
+  put '                    prxchange(''s/''!!''0E''x!!''/\\u000E/'',-1, /* SS  */ ';
+  put '                    prxchange(''s/''!!''0F''x!!''/\\u000F/'',-1, /* SF  */ ';
+  put '                    prxchange(''s/''!!''01''x!!''/\\u0001/'',-1, /* SOH */ ';
+  put '                    prxchange(''s/''!!''02''x!!''/\\u0002/'',-1, /* STX */ ';
+  put '                    prxchange(''s/''!!''02''x!!''/\\u0010/'',-1, /* DLE */ ';
+  put '                    prxchange(''s/''!!''11''x!!''/\\u0011/'',-1, /* DC1 */ ';
  put '                    prxchange(''s/\\/\\\\/'',-1,&&name&i) ';
-  put '        )))))!!''"''; ';
+  put '        ))))))))))))!!''"''; ';
  put '      %end; ';
  put '    %end; ';
  put '    run; ';
--- a/base/mp_abort.sas
+++ b/base/mp_abort.sas
@@ -85,7 +85,7 @@
  %end;

  /* Stored Process Server web app context */
-  %if %symexist(_metaport)
+  %if %symexist(_METAFOLDER)
    or "&SYSPROCESSNAME "="Compute Server "
    or &mode=INCLUDE
  %then %do;
@@ -161,12 +161,14 @@
    /* send response in SASjs JSON format */
    data _null_;
      file _webout mod lrecl=32000 encoding='utf-8';
-      length msg $32767 ;
+      length msg syswarningtext syserrortext $32767 ;
      sasdatetime=datetime();
      msg=symget('msg');
    %if &logline>0 %then %do;
      msg=cats(msg,'\n\nLog Extract:\n',symget('logmsg'));
    %end;
+      /* escape the escapes */
+      msg=tranwrd(msg,'\','\\');
      /* escape the quotes */
      msg=tranwrd(msg,'"','\"');
      /* ditch the CRLFs as chrome complains */
--- a/base/mp_jsonout.sas
+++ b/base/mp_jsonout.sas
@@ -203,8 +203,15 @@
                    prxchange('s/'!!'0A'x!!'/\n/',-1,
                    prxchange('s/'!!'0D'x!!'/\r/',-1,
                    prxchange('s/'!!'09'x!!'/\t/',-1,
+                    prxchange('s/'!!'00'x!!'/\\u0000/',-1, /* NUL */
+                    prxchange('s/'!!'0E'x!!'/\\u000E/',-1, /* SS  */
+                    prxchange('s/'!!'0F'x!!'/\\u000F/',-1, /* SF  */
+                    prxchange('s/'!!'01'x!!'/\\u0001/',-1, /* SOH */
+                    prxchange('s/'!!'02'x!!'/\\u0002/',-1, /* STX */
+                    prxchange('s/'!!'02'x!!'/\\u0010/',-1, /* DLE */
+                    prxchange('s/'!!'11'x!!'/\\u0011/',-1, /* DC1 */
                    prxchange('s/\\/\\\\/',-1,&&name&i)
-        )))))!!'"';
+        ))))))))))))!!'"';
      %end;
    %end;
    run;
--- a/meta/mm_assignlib.sas
+++ b/meta/mm_assignlib.sas
@@ -13,8 +13,8 @@
  <h4> SAS Macros </h4>
  @li mp_abort.sas

-  @param libref the libref (not name) of the metadata library
-  @param mAbort= If not assigned, HARD will call %mp_abort(), SOFT will
+  @param [in] libref The libref (not name) of the metadata library
+  @param [in] mAbort= If not assigned, HARD will call %mp_abort(), SOFT will
    silently return

  @returns libname statement
@@ -28,11 +28,11 @@
    libref
    ,mAbort=HARD
 )/*/STORE SOURCE*/;
-
+%local mp_abort msg;
+%let mp_abort=0;
 %if %sysfunc(libref(&libref)) %then %do;
-  %local mp_abort msg; %let mp_abort=0;
  data _null_;
-    length liburi LibName $200;
+    length liburi LibName msg $200;
    call missing(of _all_);
    nobj=metadata_getnobj("omsobj:SASLibrary?@Libref='&libref'",1,liburi);
    if nobj=1 then do;
@@ -46,7 +46,24 @@
          * not always helpful though.  One example, previously received:
          * NOTE: Libref XX refers to the same library metadata as libref XX.
          */
-        call symputx('msg',sysmsg(),'l');
+        msg=sysmsg();
+        if msg=:'ERROR: Libref SAVE is not assigned.' then do;
+          msg=catx(" ",
+            "Could not assign %upcase(&libref).",
+            "Please check metadata permissions!  Libname:",libname,
+            "Liburi:",liburi
+          );
+        end;
+        else if msg="ERROR: User does not have appropriate authorization "!!
+          "level for library SAVE."
+        then do;
+          msg=catx(" ",
+            "ERROR: User does not have appropriate authorization level",
+            "for library %upcase(&libref), libname:",libname,
+            "Liburi:",liburi
+          );
+        end;
+        call symputx('msg',msg,'l');
        if "&mabort"='HARD' then call symputx('mp_abort',1,'l');
      end;
      else do;
@@ -65,20 +82,16 @@
    end;
  run;

-  %if &mp_abort=1 %then %do;
-    %mp_abort(iftrue= (&mp_abort=1)
-      ,mac=mm_assignlib.sas
-      ,msg=&msg
-    )
-    %return;
-  %end;
-  %else %if %length(&msg)>2 %then %do;
-    %put NOTE: &msg;
-    %return;
-  %end;
+  %put NOTE: &msg;

 %end;
 %else %do;
  %put NOTE: Library &libref is already assigned;
 %end;
+
+%mp_abort(iftrue= (&mp_abort=1)
+  ,mac=mm_assignlib.sas
+  ,msg=%superq(msg)
+)
+
 %mend mm_assignlib;
--- a/meta/mm_createwebservice.sas
+++ b/meta/mm_createwebservice.sas
@@ -236,8 +236,15 @@ data _null_;
  put '                    prxchange(''s/''!!''0A''x!!''/\n/'',-1, ';
  put '                    prxchange(''s/''!!''0D''x!!''/\r/'',-1, ';
  put '                    prxchange(''s/''!!''09''x!!''/\t/'',-1, ';
+  put '                    prxchange(''s/''!!''00''x!!''/\\u0000/'',-1, /* NUL */ ';
+  put '                    prxchange(''s/''!!''0E''x!!''/\\u000E/'',-1, /* SS  */ ';
+  put '                    prxchange(''s/''!!''0F''x!!''/\\u000F/'',-1, /* SF  */ ';
+  put '                    prxchange(''s/''!!''01''x!!''/\\u0001/'',-1, /* SOH */ ';
+  put '                    prxchange(''s/''!!''02''x!!''/\\u0002/'',-1, /* STX */ ';
+  put '                    prxchange(''s/''!!''02''x!!''/\\u0010/'',-1, /* DLE */ ';
+  put '                    prxchange(''s/''!!''11''x!!''/\\u0011/'',-1, /* DC1 */ ';
  put '                    prxchange(''s/\\/\\\\/'',-1,&&name&i) ';
-  put '        )))))!!''"''; ';
+  put '        ))))))))))))!!''"''; ';
  put '      %end; ';
  put '    %end; ';
  put '    run; ';
--- a/sasjs/sasjsconfig.json
+++ b/sasjs/sasjsconfig.json
@@ -4,11 +4,8 @@
    "base",
    "ddl",
    "fcmp",
-    "meta",
-    "metax",
-    "server",
-    "viya",
    "lua",
+    "server",
    "tests/crossplatform",
    "tests/ddl"
  ],
@@ -39,6 +36,7 @@
      },
      "appLoc": "/Public/temp/macrocore",
      "macroFolders": [
+        "viya",
        "tests/viyaonly"
      ],
      "programFolders": [],
@@ -58,6 +56,8 @@
      },
      "appLoc": "/Shared Data/temp/macrocore",
      "macroFolders": [
+        "meta",
+        "metax",
        "tests/sas9only"
      ],
      "programFolders": [],
@@ -78,6 +78,7 @@
      },
      "appLoc": "/sasjs/core",
      "macroFolders": [
+        "server",
        "tests/serveronly"
      ],
      "programFolders": [],
@@ -92,6 +93,10 @@
      "serverType": "SAS9",
      "appLoc": "dummy",
      "macroFolders": [
+        "meta",
+        "metax",
+        "server",
+        "viya",
        "tests/sas9only",
        "tests/viyaonly"
      ]
@@ -102,6 +107,7 @@
      "serverType": "SASVIYA",
      "appLoc": "/Public/temp/macrocore",
      "macroFolders": [
+        "viya",
        "tests/viyaonly"
      ],
      "deployConfig": {
@@ -110,4 +116,4 @@
      "contextName": "SAS Job Execution compute context"
    }
  ]
-}
+}
--- a/viya/mv_createwebservice.sas
+++ b/viya/mv_createwebservice.sas
@@ -380,8 +380,15 @@ data _null_;
  put '                    prxchange(''s/''!!''0A''x!!''/\n/'',-1, ';
  put '                    prxchange(''s/''!!''0D''x!!''/\r/'',-1, ';
  put '                    prxchange(''s/''!!''09''x!!''/\t/'',-1, ';
+  put '                    prxchange(''s/''!!''00''x!!''/\\u0000/'',-1, /* NUL */ ';
+  put '                    prxchange(''s/''!!''0E''x!!''/\\u000E/'',-1, /* SS  */ ';
+  put '                    prxchange(''s/''!!''0F''x!!''/\\u000F/'',-1, /* SF  */ ';
+  put '                    prxchange(''s/''!!''01''x!!''/\\u0001/'',-1, /* SOH */ ';
+  put '                    prxchange(''s/''!!''02''x!!''/\\u0002/'',-1, /* STX */ ';
+  put '                    prxchange(''s/''!!''02''x!!''/\\u0010/'',-1, /* DLE */ ';
+  put '                    prxchange(''s/''!!''11''x!!''/\\u0011/'',-1, /* DC1 */ ';
  put '                    prxchange(''s/\\/\\\\/'',-1,&&name&i) ';
-  put '        )))))!!''"''; ';
+  put '        ))))))))))))!!''"''; ';
  put '      %end; ';
  put '    %end; ';
  put '    run; ';
Author	SHA1	Message	Date
Allan Bowe	40d694eec8	Merge pull request #203 from sasjs/invisibles fix: support SOH, STX and DC1 control characters in mp_jsonout	2022-03-29 12:02:09 +03:00
munja	6af1423666	fix: more invisibles	2022-03-28 16:26:58 +01:00
munja	23a01347f1	fix: support SOH, STX and DC1 control characters in mp_jsonout	2022-03-28 15:54:28 +01:00
Allan Bowe	7c86d6163a	Merge pull request #201 from sasjs/mm_assignlib_fix fix: enabling more descriptive mm_assignlib abort messages when library cannot be assigned	2022-03-21 18:10:56 +02:00
munja	d7233208f1	fix: enabling more descriptive mm_assignlib abort messages when library cannot be assigned	2022-03-21 16:07:27 +00:00