pastebin - collaborative debugging tool
rovema.kpaste.net RSS


msnfs41client: Patches for setting Win32 UTF-8 codepage, debugging illegal Win32 widechars, sillyrename fixes+tests+misc, 2024-11-23
Posted by Anonymous on Sat 23rd Nov 2024 15:28
raw | new post

  1. From b23912f1be572dfb1a925a0ec4d24ec44dd2177d Mon Sep 17 00:00:00 2001
  2. From: Roland Mainz <roland.mainz@nrubsig.org>
  3. Date: Sat, 23 Nov 2024 14:06:41 +0100
  4. Subject: [PATCH 1/4] cygwin: msnfs41client: terminal output should show UTF-8
  5.  output correctly via UTF-8 codepage
  6.  
  7. msnfs41client should switch to UTF-8 codepage (cp65001) so the terminal
  8. shows UTF-8 output from nfsd/nfsd_debug correctly.
  9.  
  10. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  11. ---
  12. cygwin/devel/msnfs41client.bash | 8 ++++++++
  13.  1 file changed, 8 insertions(+)
  14.  
  15. diff --git a/cygwin/devel/msnfs41client.bash b/cygwin/devel/msnfs41client.bash
  16. index 68e187e..739ab30 100755
  17. --- a/cygwin/devel/msnfs41client.bash
  18. +++ b/cygwin/devel/msnfs41client.bash
  19. @@ -401,6 +401,10 @@ function nfsclient_rundeamon
  20.  
  21.         set -o xtrace
  22.  
  23. +       # switch to UTF-8 codepage so debug output with non-ASCII characters
  24. +       # gets printed correctly on a terminal
  25. +       chcp.com 65001
  26. +
  27.         typeset -a nfsd_args=(
  28.                 'nfsd.exe'
  29.                 '-debug'
  30. @@ -508,6 +512,10 @@ function nfsclient_system_rundeamon
  31.  
  32.         set -o xtrace
  33.  
  34. +       # switch to UTF-8 codepage so debug output with non-ASCII characters
  35. +       # gets printed correctly on a terminal
  36. +       chcp.com 65001
  37. +
  38.         typeset -a nfsd_args=(
  39.                 'nfsd.exe'
  40.                 '-debug'
  41. --
  42. 2.45.1
  43.  
  44. From 171a65f65ed402f0f7f59cbeb272a56e2c63f3c9 Mon Sep 17 00:00:00 2001
  45. From: Roland Mainz <roland.mainz@nrubsig.org>
  46. Date: Sat, 23 Nov 2024 14:10:24 +0100
  47. Subject: [PATCH 2/4] daemon: |handle_nfs41_rename()|+|handle_nfs41_link()|
  48.  |WideCharToMultiByte()| errors should print filenames correctly
  49.  
  50. |WideCharToMultiByte()| errors in |handle_nfs41_rename()|+|handle_nfs41_link()|
  51. should print filenames correctly.
  52.  
  53. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  54. ---
  55. daemon/setattr.c | 17 +++++++++++++----
  56.  1 file changed, 13 insertions(+), 4 deletions(-)
  57.  
  58. diff --git a/daemon/setattr.c b/daemon/setattr.c
  59. index bfdcd4b..9eaafb5 100644
  60. --- a/daemon/setattr.c
  61. +++ b/daemon/setattr.c
  62. @@ -282,6 +282,8 @@ static int handle_nfs41_rename(void *daemon_context, setattr_upcall_args *args)
  63.          goto out;
  64.      }
  65.  
  66. +    EASSERT((rename->FileNameLength%sizeof(WCHAR)) == 0);
  67. +
  68.      dst_path.len = (unsigned short)WideCharToMultiByte(CP_UTF8,
  69.          WC_ERR_INVALID_CHARS|WC_NO_BEST_FIT_CHARS,
  70.          rename->FileName, rename->FileNameLength/sizeof(WCHAR),
  71. @@ -289,8 +291,11 @@ static int handle_nfs41_rename(void *daemon_context, setattr_upcall_args *args)
  72.      if (dst_path.len == 0) {
  73.          eprintf("handle_nfs41_rename(args->path='%s'): "
  74.              "WideCharToMultiByte() failed to convert destination "
  75. -            "filename '%S', lasterr=%d.\n",
  76. -            args->path, rename->FileName, (int)GetLastError());
  77. +            "filename '%*S', lasterr=%d.\n",
  78. +            args->path,
  79. +            (int)(rename->FileNameLength/sizeof(WCHAR)),
  80. +            rename->FileName,
  81. +            (int)GetLastError());
  82.          status = ERROR_INVALID_PARAMETER;
  83.          goto out;
  84.      }
  85. @@ -436,6 +441,8 @@ static int handle_nfs41_link(void *daemon_context, setattr_upcall_args *args)
  86.  
  87.      (void)memset(&info, 0, sizeof(info));
  88.  
  89. +    EASSERT((link->FileNameLength%sizeof(WCHAR)) == 0);
  90. +
  91.      dst_path.len = (unsigned short)WideCharToMultiByte(CP_UTF8,
  92.          WC_ERR_INVALID_CHARS|WC_NO_BEST_FIT_CHARS,
  93.          link->FileName, link->FileNameLength/sizeof(WCHAR),
  94. @@ -443,8 +450,10 @@ static int handle_nfs41_link(void *daemon_context, setattr_upcall_args *args)
  95.      if (dst_path.len == 0) {
  96.          eprintf("handle_nfs41_link(args->path='%s'): "
  97.              "WideCharToMultiByte() failed to convert destination "
  98. -            "filename '%S', lasterr=%d.\n",
  99. -            args->path, link->FileName, (int)GetLastError());
  100. +            "filename '%*S', lasterr=%d.\n",
  101. +            args->path,
  102. +            (int)(link->FileNameLength/sizeof(WCHAR)),
  103. +            link->FileName, (int)GetLastError());
  104.          status = ERROR_INVALID_PARAMETER;
  105.          goto out;
  106.      }
  107. --
  108. 2.45.1
  109.  
  110. From d8a232472f4e6086a1c2d2b6308b9511714a22d4 Mon Sep 17 00:00:00 2001
  111. From: Roland Mainz <roland.mainz@nrubsig.org>
  112. Date: Sat, 23 Nov 2024 15:30:25 +0100
  113. Subject: [PATCH 3/4] daemon: Minor cleanup in |create_silly_rename()|
  114.  
  115. Minor cleanup in |create_silly_rename()|
  116.  
  117. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  118. ---
  119. daemon/util.c | 40 +++++++++++++++++++++++++---------------
  120.  1 file changed, 25 insertions(+), 15 deletions(-)
  121.  
  122. diff --git a/daemon/util.c b/daemon/util.c
  123. index ef41a30..85acb99 100644
  124. --- a/daemon/util.c
  125. +++ b/daemon/util.c
  126. @@ -331,11 +331,16 @@ int create_silly_rename(
  127.      PBYTE buffer;
  128.      DWORD length;
  129.      const char *end = path->path + NFS41_MAX_PATH_LEN;
  130. -    const unsigned short extra_len = 2 + 16; //md5 is 16
  131. +#define MD5_HASH_LEN (16L)
  132. +#define SILLY_RENAME_PREPOSTFIX_LEN (2L)
  133. +    const unsigned short extra_len =
  134. +        SILLY_RENAME_PREPOSTFIX_LEN + MD5_HASH_LEN;
  135.      char name[NFS41_MAX_COMPONENT_LEN+1];
  136. -    unsigned char fhmd5[17] = { 0 };
  137. +    unsigned char fhmd5[MD5_HASH_LEN+1];
  138.      char *tmp;
  139.      int status = NO_ERROR, i;
  140. +
  141. +    (void)memset(fhmd5, 0, sizeof(fhmd5));
  142.  
  143.      if (path->len + extra_len >= NFS41_MAX_PATH_LEN) {
  144.          status = ERROR_FILENAME_EXCED_RANGE;
  145. @@ -346,47 +351,52 @@ int create_silly_rename(
  146.      if (!CryptAcquireContext(&context, NULL, NULL,
  147.          PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) {
  148.          status = GetLastError();
  149. -        eprintf("CryptAcquireContext() failed with %d\n", status);
  150. +        eprintf("create_silly_rename: "
  151. +            "CryptAcquireContext() failed with %d\n", status);
  152.          goto out;
  153.      }
  154.      if (!CryptCreateHash(context, CALG_MD5, 0, 0, &hash)) {
  155.          status = GetLastError();
  156. -        eprintf("CryptCreateHash() failed with %d\n", status);
  157. +        eprintf("create_silly_rename: "
  158. +            "CryptCreateHash() failed with %d\n", status);
  159.          goto out_context;
  160.      }
  161.  
  162.      if (!CryptHashData(hash, (const BYTE*)fh->fh, (DWORD)fh->len, 0)) {
  163.          status = GetLastError();
  164. -        eprintf("CryptHashData() failed with %d\n", status);
  165. +        eprintf("create_silly_rename: "
  166. +            "CryptHashData() failed with %d\n", status);
  167.          goto out_hash;
  168.      }
  169.  
  170.      /* extract the hash buffer */
  171.      buffer = (PBYTE)fhmd5;
  172. -    length = 16;
  173. +    length = MD5_HASH_LEN;
  174.      if (!CryptGetHashParam(hash, HP_HASHVAL, buffer, &length, 0)) {
  175.          status = GetLastError();
  176. -        eprintf("CryptGetHashParam(val) failed with %d\n", status);
  177. +        eprintf("create_silly_rename: "
  178. +            "CryptGetHashParam(val) failed with %d\n", status);
  179.          goto out_hash;
  180. -    }    
  181. +    }
  182.  
  183.      last_component(path->path, path->path + path->len, silly);
  184. -    StringCchCopyNA(name, NFS41_MAX_COMPONENT_LEN+1, silly->name, silly->len);
  185. +    (void)StringCchCopyNA(name, NFS41_MAX_COMPONENT_LEN+1,
  186. +        silly->name, silly->len);
  187.  
  188.      tmp = (char*)silly->name;
  189. -    StringCchPrintfA(tmp, end - tmp, ".%s.", name);
  190. -    tmp += (size_t)silly->len + 2L;
  191. +    (void)StringCchPrintfA(tmp, end - tmp, ".%s.", name);
  192. +    tmp += (size_t)silly->len + SILLY_RENAME_PREPOSTFIX_LEN;
  193.  
  194. -    for (i = 0; i < 16; i++, tmp++)
  195. -        StringCchPrintfA(tmp, end - tmp, "%x", fhmd5[i]);
  196. +    for (i = 0; i < MD5_HASH_LEN; i++, tmp++)
  197. +        (void)StringCchPrintfA(tmp, end - tmp, "%1.1x", fhmd5[i]);
  198.  
  199.      path->len = path->len + extra_len;
  200.      silly->len = silly->len + extra_len;
  201.  
  202.  out_hash:
  203. -    CryptDestroyHash(hash);
  204. +    (void)CryptDestroyHash(hash);
  205.  out_context:
  206. -    CryptReleaseContext(context, 0);
  207. +    (void)CryptReleaseContext(context, 0);
  208.  out:
  209.      return status;
  210.  }
  211. --
  212. 2.45.1
  213.  
  214. From f79bfc7d7c7801b140d84c616a27fdd7dc71781d Mon Sep 17 00:00:00 2001
  215. From: Roland Mainz <roland.mainz@nrubsig.org>
  216. Date: Sat, 23 Nov 2024 15:54:12 +0100
  217. Subject: [PATCH 4/4] daemon,tests: NFS "silly rename" should prefix renamed
  218.  files with ".nfs"
  219.  
  220. Deleing a file which is still in use (i.e. open fd) causes a NFS client
  221. to do a "silly rename", e.g. "foo" gets renamed to ".nfsXXXX" until
  222. the client does not use it any more.
  223.  
  224. The NFS server has a weekly cron job removing files called ".nfs*" which
  225. are more than a week old to deal with .nfs* files from NFS clients which
  226. crashed while having deleted files open.
  227.  
  228. Unfortunately we didn't use the ".nfs" prefix, which causes the
  229. NFS server scripts to ignore such files.
  230.  
  231. The fix is to use the ".nfs" prefix.
  232.  
  233. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  234. ---
  235. daemon/util.c            |  5 +++--
  236.  tests/manual_testing.txt | 13 +++++++++++++
  237.  2 files changed, 16 insertions(+), 2 deletions(-)
  238.  
  239. diff --git a/daemon/util.c b/daemon/util.c
  240. index 85acb99..a84cca0 100644
  241. --- a/daemon/util.c
  242. +++ b/daemon/util.c
  243. @@ -332,7 +332,8 @@ int create_silly_rename(
  244.      DWORD length;
  245.      const char *end = path->path + NFS41_MAX_PATH_LEN;
  246.  #define MD5_HASH_LEN (16L)
  247. -#define SILLY_RENAME_PREPOSTFIX_LEN (2L)
  248. +/* |SILLY_RENAME_PREPOSTFIX_LEN| == 2*strlen(".")+strlen(".nfs") */
  249. +#define SILLY_RENAME_PREPOSTFIX_LEN (6L)
  250.      const unsigned short extra_len =
  251.          SILLY_RENAME_PREPOSTFIX_LEN + MD5_HASH_LEN;
  252.      char name[NFS41_MAX_COMPONENT_LEN+1];
  253. @@ -384,7 +385,7 @@ int create_silly_rename(
  254.          silly->name, silly->len);
  255.  
  256.      tmp = (char*)silly->name;
  257. -    (void)StringCchPrintfA(tmp, end - tmp, ".%s.", name);
  258. +    (void)StringCchPrintfA(tmp, end - tmp, ".nfs.%s.", name);
  259.      tmp += (size_t)silly->len + SILLY_RENAME_PREPOSTFIX_LEN;
  260.  
  261.      for (i = 0; i < MD5_HASH_LEN; i++, tmp++)
  262. diff --git a/tests/manual_testing.txt b/tests/manual_testing.txt
  263. index 8ba983c..16972b0 100644
  264. --- a/tests/manual_testing.txt
  265. +++ b/tests/manual_testing.txt
  266. @@ -422,4 +422,17 @@ bash /usr/share/msnfs41client/tests/misc/wintartests/wintartest_seq001.bash
  267.  cd /cygdrive/n/xxx/
  268.  bash /usr/share/msnfs41client/tests/misc/wintartest_comparewinvsgnu001.bash mytarfile.tar.bz2
  269.  
  270. +#
  271. +# Test "silly rename"
  272. +#
  273. +# Deleing a file which is still in use (i.e. open fd) causes a NFS client
  274. +# to do a "silly rename", e.g. "foo" gets renamed to ".nfsXXXX" until
  275. +# the client does not use it any more.
  276. +#
  277. +# The NFS server has a weekly cron job removing files called ".nfs*" which
  278. +# are more than a week old to deal with .nfs* files from NFS clients which
  279. +# crashed while having deleted files open.
  280. +bash -c 'set -o errexit ; rm -Rf sillytestdir ; mkdir sillytestdir ; cd sillytestdir ; touch sillytest ; ( command exec {n}<"sillytest" ; printf "fd=%d\n" $n ; sleep 10) & sleep 1 ; ls -la ; cmd /C "del sillytest" ; ls -la ; if [[ "$(ls -1 .nfs*)" != "" ]] ; then echo "# test OK" ; else echo "# test FAILED" ; fi ; wait'
  281. +
  282. +#
  283.  # EOF.
  284. --
  285. 2.45.1

Submit a correction or amendment below (click here to make a fresh posting)
After submitting an amendment, you'll be able to view the differences between the old and new posts easily.

Syntax highlighting:

To highlight particular lines, prefix each line with {%HIGHLIGHT}




All content is user-submitted.
The administrators of this site (kpaste.net) are not responsible for their content.
Abuse reports should be emailed to us at