pastebin - collaborative debugging tool
rovema.kpaste.net RSS


msnfs41client: Patches to support reading POSIX symlinks with absolute paths, tests+misc, 2025-02-24
Posted by Anonymous on Mon 24th Feb 2025 16:45
raw | new post

  1. From 7bb77bd12e5c4699549bb2bda3ea1d76431d9ef6 Mon Sep 17 00:00:00 2001
  2. From: Roland Mainz <roland.mainz@nrubsig.org>
  3. Date: Mon, 24 Feb 2025 13:53:46 +0100
  4. Subject: [PATCH 1/7] tests: cthon04 should be build with -DNATIVE64=1 for
  5.  largefile tests
  6.  
  7. cthon04 should be build with -DNATIVE64=1 for largefile tests,
  8. otherwise these tests are skipped.
  9.  
  10. Reported-by: Josh Hurst <joshhurst@gmail.com>
  11. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  12. ---
  13. tests/manual_testing.txt | 4 ++--
  14.  1 file changed, 2 insertions(+), 2 deletions(-)
  15.  
  16. diff --git a/tests/manual_testing.txt b/tests/manual_testing.txt
  17. index ea321e2..100ab00 100644
  18. --- a/tests/manual_testing.txt
  19. +++ b/tests/manual_testing.txt
  20. @@ -1,5 +1,5 @@
  21.  #
  22. -# ms-nfs41-client manual testing sequence, 2025-02-18
  23. +# ms-nfs41-client manual testing sequence, 2025-02-24
  24.  #
  25.  # Draft version, needs to be turned into automated tests
  26.  # if possible
  27. @@ -157,7 +157,7 @@ cd cthon04/
  28.  git config --global --add safe.directory "$PWD"
  29.  git checkout 6c9abfd6907b2b43036af111cc600ab60ef804e5
  30.  git am ../ms-nfs41-client/tests/cthon04/*.patch
  31. -(make CC="gcc -std=gnu17 -Wno-implicit-int -Wno-implicit-function-declaration -Wno-incompatible-pointer-types" 2>&1 | tee buildlog.log)
  32. +(make CC="gcc -std=gnu17 -Wno-implicit-int -Wno-implicit-function-declaration -Wno-incompatible-pointer-types -DNATIVE64=1" 2>&1 | tee buildlog.log)
  33.  (rm -Rf testdir1 && mkdir testdir1 && PATH="$PATH:." ksh93 ./runtests -a -t "$PWD/testdir1" 2>&1 | tee testrun.log)
  34.  
  35.  
  36. --
  37. 2.45.1
  38.  
  39. From eda1566285437051c2188899a0b0f5649508bfc5 Mon Sep 17 00:00:00 2001
  40. From: Roland Mainz <roland.mainz@nrubsig.org>
  41. Date: Mon, 24 Feb 2025 13:55:58 +0100
  42. Subject: [PATCH 2/7] cygwin: C:\etc should contain a symlink to the systems
  43.  etc/hosts
  44.  
  45. C:\etc should contain a symlink to the systems etc/hosts, so
  46. non-Windows admins can find it faster
  47.  
  48. Reported-by: Lionel Cons <lionelcons1972@gmail.com>
  49. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  50. ---
  51. cygwin/devel/msnfs41client.bash | 2 ++
  52.  1 file changed, 2 insertions(+)
  53.  
  54. diff --git a/cygwin/devel/msnfs41client.bash b/cygwin/devel/msnfs41client.bash
  55. index 701ad59..b12eb1e 100755
  56. --- a/cygwin/devel/msnfs41client.bash
  57. +++ b/cygwin/devel/msnfs41client.bash
  58. @@ -147,6 +147,8 @@ function nfsclient_install
  59.         mkdir -p /cygdrive/c/etc
  60.         cp etc_netconfig /cygdrive/c/etc/netconfig
  61.         cp ms-nfs41-idmap.conf /cygdrive/c/etc/.
  62. +       # help non-Windows admins find /etc/hosts by providing a symlink
  63. +       ln -sf /cygdrive/c/Windows/System32/drivers/etc/hosts /cygdrive/c/etc/hosts
  64.  
  65.         # enable symlink lookup
  66.         # and then print the status
  67. --
  68. 2.45.1
  69.  
  70. From e4d1f104bea748e3f5eaa457465cfe12e234c359 Mon Sep 17 00:00:00 2001
  71. From: Roland Mainz <roland.mainz@nrubsig.org>
  72. Date: Mon, 24 Feb 2025 13:57:36 +0100
  73. Subject: [PATCH 3/7] daemon: |attr_cache_entry_create()| should init more
  74.  fields by default
  75.  
  76. |attr_cache_entry_create()| should init more fields by default, to
  77. make sure we get less noise while debugging.
  78.  
  79. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  80. ---
  81. daemon/name_cache.c | 5 +++++
  82.  1 file changed, 5 insertions(+)
  83.  
  84. diff --git a/daemon/name_cache.c b/daemon/name_cache.c
  85. index 11295b5..631d362 100644
  86. --- a/daemon/name_cache.c
  87. +++ b/daemon/name_cache.c
  88. @@ -159,7 +159,12 @@ static int attr_cache_entry_create(
  89.      list_remove(&entry->free_entry);
  90.  
  91.      entry->nc_attrs = 0;
  92. +    entry->change = 0ULL;
  93. +    entry->size = 0ULL;
  94. +    entry->space_used = 0ULL;
  95.      entry->fileid = fileid;
  96. +    entry->fsid_major = 0ULL;
  97. +    entry->fsid_minor = 0ULL;
  98.      entry->invalidated = FALSE;
  99.      entry->delegated = FALSE;
  100.      *entry_out = entry;
  101. --
  102. 2.45.1
  103.  
  104. From 101f66b905bed487525e8cda577dc56570530b1d Mon Sep 17 00:00:00 2001
  105. From: Roland Mainz <roland.mainz@nrubsig.org>
  106. Date: Mon, 24 Feb 2025 14:20:30 +0100
  107. Subject: [PATCH 4/7] sys,tests: Add support for reading absolute POSIX
  108.  symlinks
  109.  
  110. Add support for reading absolute POSIX symlinks, e.g.
  111. $ ln -s "/" symlink2root #, plus add some tests for them.
  112.  
  113. These symlinks are relative to C:\cygwin64 (64bit kernels) or
  114. C:\cygwin (32bit kernels)
  115.  
  116. Reported-by: Josh Hurst <joshhurst@gmail.com>
  117. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  118. ---
  119. sys/nfs41sys_symlink.c   | 69 ++++++++++++++++++++++++++++++++++++++++
  120.  tests/manual_testing.txt |  7 ++++
  121.  2 files changed, 76 insertions(+)
  122.  
  123. diff --git a/sys/nfs41sys_symlink.c b/sys/nfs41sys_symlink.c
  124. index 442b883..fdfd4fc 100644
  125. --- a/sys/nfs41sys_symlink.c
  126. +++ b/sys/nfs41sys_symlink.c
  127. @@ -540,6 +540,16 @@ bool is_us_cygdrive_path(UNICODE_STRING *restrict us)
  128.      return false;
  129.  }
  130.  
  131. +static
  132. +bool is_us_posixroot_path(UNICODE_STRING *restrict us)
  133. +{
  134. +    if ((us->Length >= (1*sizeof(wchar_t))) &&
  135. +        (!memcmp(&us->Buffer[0],
  136. +            L"\\", (1*sizeof(wchar_t)))))
  137. +        return true;
  138. +    return false;
  139. +}
  140. +
  141.  NTSTATUS nfs41_GetSymlinkReparsePoint(
  142.      IN OUT PRX_CONTEXT RxContext)
  143.  {
  144. @@ -803,6 +813,65 @@ NTSTATUS nfs41_GetSymlinkReparsePoint(
  145.              RxContext->IoStatusBlock.Information =
  146.                  (ULONG_PTR)HeaderLen + TargetName.Length;
  147.          }
  148. +        else if (is_us_posixroot_path(&TargetName)) {
  149. +            const USHORT HeaderLen = FIELD_OFFSET(REPARSE_DATA_BUFFER,
  150. +                SymbolicLinkReparseBuffer.PathBuffer);
  151. +
  152. +            DbgP("nfs41_GetSymlinkReparsePoint: POSIX root symlink codepath\n");
  153. +
  154. +            /*
  155. +             * Copy data into FsCtl buffer, using L"C:\\cygwin64"
  156. +             * as prefix
  157. +             */
  158. +            wchar_t *outbuff = (wchar_t *)
  159. +                ((PBYTE)FsCtl->pOutputBuffer + HeaderLen);
  160. +            size_t outbuff_len;
  161. +            if ((TargetName.Buffer[0] == L'\\') &&
  162. +                (TargetName.Length == (1*sizeof(wchar_t)))) {
  163. +                /*
  164. +                 * Special case "bar -> /", to avoid that the
  165. +                 * symlink target will be "//"
  166. +                 */
  167. +                TargetName.Length = 0;
  168. +            }
  169. +            (void)_snwprintf(outbuff,
  170. +                (FsCtl->OutputBufferLength-HeaderLen) / sizeof(wchar_t),
  171. +#ifdef _WIN64
  172. +                /* |TargetName| always starts with a backslash */
  173. +                L"C:\\cygwin64%wZ",
  174. +#else
  175. +                /* |TargetName| always starts with a backslash */
  176. +                L"C:\\cygwin%wZ",
  177. +#endif /* _WIN64 */
  178. +                &TargetName);
  179. +            outbuff_len = wcslen(outbuff);
  180. +
  181. +            TargetName.Length =
  182. +                (USHORT)outbuff_len*sizeof(wchar_t);
  183. +
  184. +            DbgP("nfs41_GetSymlinkReparsePoint: "
  185. +                "new posixroot TargetName='%wZ'\n",
  186. +                &TargetName);
  187. +
  188. +            Reparse->ReparseTag = IO_REPARSE_TAG_SYMLINK;
  189. +            Reparse->ReparseDataLength = HeaderLen + TargetName.Length -
  190. +            REPARSE_DATA_BUFFER_HEADER_SIZE;
  191. +            Reparse->Reserved = 0;
  192. +            Reparse->SymbolicLinkReparseBuffer.Flags =
  193. +                SYMLINK_FLAG_RELATIVE;
  194. +            /* PrintName and SubstituteName point to the same string */
  195. +            Reparse->SymbolicLinkReparseBuffer.SubstituteNameOffset = 0;
  196. +            Reparse->SymbolicLinkReparseBuffer.SubstituteNameLength =
  197. +                TargetName.Length;
  198. +            Reparse->SymbolicLinkReparseBuffer.PrintNameOffset = 0;
  199. +            Reparse->SymbolicLinkReparseBuffer.PrintNameLength =
  200. +                TargetName.Length;
  201. +
  202. +            print_reparse_buffer(Reparse);
  203. +
  204. +            RxContext->IoStatusBlock.Information =
  205. +                (ULONG_PTR)HeaderLen + TargetName.Length;
  206. +        }
  207.          else {
  208.              status = STATUS_IO_REPARSE_DATA_INVALID;
  209.              DbgP("nfs41_GetSymlinkReparsePoint: "
  210. diff --git a/tests/manual_testing.txt b/tests/manual_testing.txt
  211. index 100ab00..a72751d 100644
  212. --- a/tests/manual_testing.txt
  213. +++ b/tests/manual_testing.txt
  214. @@ -237,6 +237,13 @@ rm -f symlink1_to_unc ; cmd /C 'mklink /D symlink1_to_unc \\derfwnb4966_ipv6link
  215.  # \\derfwpc5131_ipv4@2049\nfs4\export\home2\rmainz\ with a subdir "tmp")
  216.  rm -f symlink1_to_h_tmp ; cmd /C 'mklink /D symlink1_to_h_tmp \\derfwpc5131_ipv4@2049\nfs4\export\home2\rmainz\tmp' ; powershell -Command 'cd symlink1_to_h_tmp ; if ($?) { dir ; if ($?) { echo "test OK" } else { echo "dir failed" } } else { echo "cd failed" }'
  217.  
  218. +#
  219. +# Tests for absolute (start from root "/") POSIX symlinks
  220. +#
  221. +# all test should print "OK test <testnum>"
  222. +# ("." is a relative symlink, just included here for more coverage)
  223. +ksh93 -c 'typeset -a a=( "/" "/usr" "/tmp" "/usr/bin" "$PWD" "/dev/null" "." ) ; for ((i=0 ; i < ${#a[@]} ; i++ )) ; do rm -f "syml$i" ; ln -sf "${a[$i]}" "syml$i" ; l="$(readlink "syml$i")" ; if [[ "$l" == "${a[$i]}" ]] ; then printf "OK test %d\n" i ; else printf "FAIL test %d\n" i ; fi ; done'
  224. +
  225.  #
  226.  # Tests for groups
  227.  # (Add groups "cygwingrp1" and "cygwingrp2" to both Linux NFSv4 server
  228. --
  229. 2.45.1
  230.  
  231. From 8180088f7abed011dabc52f7fe3256d72e89ff5b Mon Sep 17 00:00:00 2001
  232. From: Roland Mainz <roland.mainz@nrubsig.org>
  233. Date: Mon, 24 Feb 2025 15:14:30 +0100
  234. Subject: [PATCH 5/7] tests: Update winfstest usage instructions
  235.  
  236. Update winfstest usage instructions
  237.  
  238. Reported-by: Josh Hurst <joshhurst@gmail.com>
  239. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  240. ---
  241. tests/winfstest/README.txt | 2 ++
  242.  1 file changed, 2 insertions(+)
  243.  
  244. diff --git a/tests/winfstest/README.txt b/tests/winfstest/README.txt
  245. index a6b35b3..455b64f 100644
  246. --- a/tests/winfstest/README.txt
  247. +++ b/tests/winfstest/README.txt
  248. @@ -10,6 +10,7 @@ set -o errexit
  249.  git clone https://github.com/kofemann/ms-nfs41-client.git
  250.  git clone https://github.com/dimov-cz/winfstest.git
  251.  cd winfstest/
  252. +git config --global --add safe.directory "$PWD"
  253.  
  254.  # switch to commit which is known to work (with our patches)
  255.  git checkout '525f878c06c585619eadd769c8ed9dcdf175b026'
  256. @@ -21,6 +22,7 @@ MSBuild.exe winfstest.sln -t:Build -p:Configuration=Debug -p:Platform=x64
  257.  
  258.  # get testsuite binary path
  259.  cd TestSuite
  260. +chmod a+x winfstest.exe
  261.  winfstest_testsuite_path="$(pwd)"
  262.  
  263.  # create test dir on NFSv4.1 filesystem
  264. --
  265. 2.45.1
  266.  
  267. From b15531fb083df853e4d63b01d4ea822e563f4433 Mon Sep 17 00:00:00 2001
  268. From: Roland Mainz <roland.mainz@nrubsig.org>
  269. Date: Mon, 24 Feb 2025 15:52:59 +0100
  270. Subject: [PATCH 6/7] cygwin: Windows 32bit should have a
  271.  /sbin/nfs_mount.i686.exe too
  272.  
  273. Windows 32bit should have a /sbin/nfs_mount.i686.exe too, so
  274. scripts do not trip over the lack of nfs_mount.i686.exe on 32bit
  275. machines
  276.  
  277. Reported-by: Cedric Blancher <cedric.blancher@gmail.com>
  278. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  279. ---
  280. cygwin/Makefile.install | 9 ++++++---
  281.  1 file changed, 6 insertions(+), 3 deletions(-)
  282.  
  283. diff --git a/cygwin/Makefile.install b/cygwin/Makefile.install
  284. index 98e4235..c722344 100644
  285. --- a/cygwin/Makefile.install
  286. +++ b/cygwin/Makefile.install
  287. @@ -43,11 +43,14 @@ installdest:
  288.         # we need a hardlink for nfs_umount.exe, softlinks do not work
  289.         ln -f $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfs_mount.exe  $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfs_umount.exe
  290.         # install 32bit nfs_mount.exe on 64bit Windows to assist with debugging 32bit issues
  291. -       # we use the "Release" version to avoid issues with missing debug libraries
  292. +       # we use the "Release" version on 64bit to avoid issues with missing debug libraries
  293. +       # on 32bit we just create a hardlink from nfs_mount.exe to nfs_mount.i686.exe
  294.         if [[ "$(CYGWIN_BASEPATH)" == *64* ]] ; then \
  295. -               cp $(VS_BUILD_DIR32)/../Release/nfs_mount.exe   $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfs_mount.i686.exe ; \
  296. -               ln -f $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfs_mount.i686.exe     $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfs_umount.i686.exe ; \
  297. +               cp $(VS_BUILD_DIR32)/../Release/nfs_mount.exe $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfs_mount.i686.exe ; \
  298. +        else \
  299. +               ln -f $(VS_BUILD_DIR32)/../Debug/nfs_mount.exe $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfs_mount.i686.exe ; \
  300.         fi
  301. +       ln -f $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfs_mount.i686.exe $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfs_umount.i686.exe
  302.         cp $(VS_BUILD_DIR)/nfsd.*               $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/.
  303.         cp $(VS_BUILD_DIR)/nfs_install.*        $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/.
  304.         cp $(VS_BUILD_DIR)/libtirpc.*   $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/.
  305. --
  306. 2.45.1
  307.  
  308. From 3ac7a3b30385a5891de57e9f2296395f8b68a5bf Mon Sep 17 00:00:00 2001
  309. From: Roland Mainz <roland.mainz@nrubsig.org>
  310. Date: Mon, 24 Feb 2025 16:42:49 +0100
  311. Subject: [PATCH 7/7] tests: Add tests for mkdir with UNC path
  312.  
  313. Add tests for mkdir with UNC path, because early Cygwin 3.6 test
  314. releases choked on the '@' in the UNC path.
  315.  
  316. Reported-by: Martin Wege <martin.l.wege@gmail.com>
  317. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  318. ---
  319. tests/manual_testing.txt | 14 ++++++++++++++
  320.  1 file changed, 14 insertions(+)
  321.  
  322. diff --git a/tests/manual_testing.txt b/tests/manual_testing.txt
  323. index a72751d..0bf5029 100644
  324. --- a/tests/manual_testing.txt
  325. +++ b/tests/manual_testing.txt
  326. @@ -244,6 +244,20 @@ rm -f symlink1_to_h_tmp ; cmd /C 'mklink /D symlink1_to_h_tmp \\derfwpc5131_ipv4
  327.  # ("." is a relative symlink, just included here for more coverage)
  328.  ksh93 -c 'typeset -a a=( "/" "/usr" "/tmp" "/usr/bin" "$PWD" "/dev/null" "." ) ; for ((i=0 ; i < ${#a[@]} ; i++ )) ; do rm -f "syml$i" ; ln -sf "${a[$i]}" "syml$i" ; l="$(readlink "syml$i")" ; if [[ "$l" == "${a[$i]}" ]] ; then printf "OK test %d\n" i ; else printf "FAIL test %d\n" i ; fi ; done'
  329.  
  330. +#
  331. +# Test for mkdir with UNC path
  332. +#
  333. +Example:
  334. +---- snip ----
  335. +# get UNC path for driver letterr 'L':
  336. +$ powershell -Command 'Get-PSDrive -Name L | Select-Object -Property DisplayRoot,CurrentLocation | Format-List' | ksh93 -c 'compound c=(typeset -A ar) ; while IFS="" read -r l ; do dummy="${l/~(Elr)(.+?)[[:space:]]*:[[:space:]](.+)\015/x}" ; [[ "${.sh.match[1]-}" == "" ]] && continue ; c.ar["${.sh.match[1]}"]="${.sh.match[2]}" ; done ; cygpath -u "$(printf "%s\\\\%s\n" "${c.ar[DisplayRoot]}" "${c.ar[CurrentLocation]}")"'
  337. +//derfwnb4966_ipv6linklocal@2049/nfs4/bigdisk/builds/bash_build1
  338. +# tests
  339. +mkdir -p //derfwnb4966_ipv6linklocal@2049/nfs4/bigdisk/builds/bash_build1/a1/b1/c1 || echo FAIL
  340. +mkdir //derfwnb4966_ipv6linklocal@2049/nfs4/bigdisk/builds/bash_build1/a2 || echo FAIL
  341. +mkdir //derfwnb4966_ipv6linklocal@2049/nfs4/bigdisk/builds/bash_build1/a2/b2 || echo FAIL
  342. +---- snip ----
  343. +
  344.  #
  345.  # Tests for groups
  346.  # (Add groups "cygwingrp1" and "cygwingrp2" to both Linux NFSv4 server
  347. --
  348. 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