summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-02-24 23:05:45 +0100
committerLudovic Courtès <ludo@gnu.org>2015-02-24 23:43:03 +0100
commit2178ed66f7ae8f793078c7e392af4bf1fb472968 (patch)
tree91589714052eb7d3fb36ca61f538ca72a578143c
parent43da8f018d5835b62e8f5f1f4e2cc701f828a3db (diff)
build: Reject or warn against file name length limit overruns.
* m4/guix.m4 (GUIX_TEST_ROOT_DIRECTORY, LINUX_HASH_BANG_LIMIT, SOCKET_FILE_NAME_LIMIT, GUIX_SOCKET_FILE_NAME_LENGTH, GUIX_TEST_SOCKET_FILE_NAME_LENGTH, GUIX_HASH_BANG_LENGTH, GUIX_CHECK_FILE_NAME_LIMITS): New macros. * configure.ac: Use 'GUIX_CHECK_FILE_NAME_LIMITS'. * config-daemon.ac: Use 'GUIX_TEST_ROOT_DIRECTORY'. * test-env.in: Check socket name length and emit warning if it exceeds 107.
-rw-r--r--config-daemon.ac5
-rw-r--r--configure.ac2
-rw-r--r--m4/guix.m458
-rw-r--r--test-env.in9
4 files changed, 69 insertions, 5 deletions
diff --git a/config-daemon.ac b/config-daemon.ac
index 32520acbf23..5f83d45a4cb 100644
--- a/config-daemon.ac
+++ b/config-daemon.ac
@@ -127,9 +127,8 @@ if test "x$guix_build_daemon" = "xyes"; then
127 fi 127 fi
128 128
129 dnl Temporary directory used to store the daemon's data. 129 dnl Temporary directory used to store the daemon's data.
130 AC_MSG_CHECKING([for unit test root]) 130 GUIX_TEST_ROOT_DIRECTORY
131 GUIX_TEST_ROOT="`pwd`/test-tmp" 131 GUIX_TEST_ROOT="$ac_cv_guix_test_root"
132 AC_MSG_RESULT([$GUIX_TEST_ROOT])
133 AC_SUBST([GUIX_TEST_ROOT]) 132 AC_SUBST([GUIX_TEST_ROOT])
134 133
135 AC_CONFIG_FILES([nix/scripts/list-runtime-roots], 134 AC_CONFIG_FILES([nix/scripts/list-runtime-roots],
diff --git a/configure.ac b/configure.ac
index 6f75fa3d7d1..940be768c7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +50,8 @@ AC_SUBST([guix_localstatedir])
50AC_SUBST([guix_sysconfdir]) 50AC_SUBST([guix_sysconfdir])
51AC_SUBST([guix_sbindir]) 51AC_SUBST([guix_sbindir])
52 52
53GUIX_CHECK_FILE_NAME_LIMITS
54
53dnl We require the pkg.m4 set of macros from pkg-config. 55dnl We require the pkg.m4 set of macros from pkg-config.
54dnl Make sure it's available. 56dnl Make sure it's available.
55m4_pattern_forbid([PKG_CHECK_MODULES]) 57m4_pattern_forbid([PKG_CHECK_MODULES])
diff --git a/m4/guix.m4 b/m4/guix.m4
index d4415598b04..445ce857dd6 100644
--- a/m4/guix.m4
+++ b/m4/guix.m4
@@ -1,5 +1,5 @@
1dnl GNU Guix --- Functional package management for GNU 1dnl GNU Guix --- Functional package management for GNU
2dnl Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> 2dnl Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
3dnl Copyright © 2014 Mark H Weaver <mhw@netris.org> 3dnl Copyright © 2014 Mark H Weaver <mhw@netris.org>
4dnl 4dnl
5dnl This file is part of GNU Guix. 5dnl This file is part of GNU Guix.
@@ -162,3 +162,59 @@ AC_DEFUN([GUIX_CHECK_UNBUFFERED_CBIP], [
162 ac_cv_guix_cbips_support_setvbuf=no 162 ac_cv_guix_cbips_support_setvbuf=no
163 fi]) 163 fi])
164]) 164])
165
166dnl GUIX_TEST_ROOT_DIRECTORY
167AC_DEFUN([GUIX_TEST_ROOT_DIRECTORY], [
168 AC_CACHE_CHECK([for unit test root directory],
169 [ac_cv_guix_test_root],
170 [ac_cv_guix_test_root="`pwd`/test-tmp"])
171])
172
173dnl 'BINPRM_BUF_SIZE' constant in Linux. The Hurd has a limit
174dnl of about a page (see exec/hashexec.c.)
175m4_define([LINUX_HASH_BANG_LIMIT], 128)
176
177dnl Hardcoded 'sun_path' length in <sys/un.h>.
178m4_define([SOCKET_FILE_NAME_LIMIT], 108)
179
180dnl GUIX_SOCKET_FILE_NAME_LENGTH
181AC_DEFUN([GUIX_SOCKET_FILE_NAME_LENGTH], [
182 AC_CACHE_CHECK([the length of the installed socket file name],
183 [ac_cv_guix_socket_file_name_length],
184 [ac_cv_guix_socket_file_name_length="`echo -n "$guix_localstatedir/guix/daemon-socket/socket" | wc -c`"])
185])
186
187dnl GUIX_TEST_SOCKET_FILE_NAME_LENGTH
188AC_DEFUN([GUIX_TEST_SOCKET_FILE_NAME_LENGTH], [
189 AC_REQUIRE([GUIX_TEST_ROOT_DIRECTORY])
190 AC_CACHE_CHECK([the length of the socket file name used in tests],
191 [ac_cv_guix_test_socket_file_name_length],
192 [ac_cv_guix_test_socket_file_name_length="`echo -n "$ac_cv_guix_test_root/var/123456/daemon-socket/socket" | wc -c`"])
193])
194
195dnl GUIX_HASH_BANG_LENGTH
196AC_DEFUN([GUIX_HASH_BANG_LENGTH], [
197 AC_CACHE_CHECK([the length of a typical hash bang line],
198 [ac_cv_guix_hash_bang_length],
199 [ac_cv_guix_hash_bang_length=`echo -n "$storedir/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bootstrap-binaries-0/bin/bash" | wc -c`])
200])
201
202dnl GUIX_CHECK_FILE_NAME_LIMITS
203dnl
204dnl GNU/Linux has a couple of silly limits that we can easily run into.
205dnl Make sure everything is fine with the current settings.
206AC_DEFUN([GUIX_CHECK_FILE_NAME_LIMITS], [
207 AC_REQUIRE([GUIX_SOCKET_FILE_NAME_LENGTH])
208 AC_REQUIRE([GUIX_TEST_SOCKET_FILE_NAME_LENGTH])
209 AC_REQUIRE([GUIX_HASH_BANG_LENGTH])
210
211 if test "$ac_cv_guix_socket_file_name_length" -ge ]SOCKET_FILE_NAME_LIMIT[; then
212 AC_MSG_ERROR([socket file name would exceed the maxium allowed length])
213 fi
214 if test "$ac_cv_guix_test_socket_file_name_length" -ge ]SOCKET_FILE_NAME_LIMIT[; then
215 AC_MSG_WARN([socket file name limit may be exceeded when running tests])
216 fi
217 if test "$ac_cv_guix_hash_bang_length" -ge ]LINUX_HASH_BANG_LIMIT[; then
218 AC_MSG_ERROR([store directory '$storedir' would lead to overly long hash-bang lines])
219 fi
220])
diff --git a/test-env.in b/test-env.in
index f66a0db555e..a7f506ec192 100644
--- a/test-env.in
+++ b/test-env.in
@@ -1,7 +1,7 @@
1#!/bin/sh 1#!/bin/sh
2 2
3# GNU Guix --- Functional package management for GNU 3# GNU Guix --- Functional package management for GNU
4# Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> 4# Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
5# 5#
6# This file is part of GNU Guix. 6# This file is part of GNU Guix.
7# 7#
@@ -52,6 +52,13 @@ then
52 # Currently, in Nix builds, we're at ~106 chars... 52 # Currently, in Nix builds, we're at ~106 chars...
53 NIX_STATE_DIR="@GUIX_TEST_ROOT@/var/$$" 53 NIX_STATE_DIR="@GUIX_TEST_ROOT@/var/$$"
54 54
55 # We can't exit when we reach the limit, because perhaps the test doesn't
56 # actually rely on the daemon, but at least warn.
57 if test "`echo -n "$NIX_STATE_DIR/daemon-socket/socket" | wc -c`" -ge 108
58 then
59 echo "warning: exceeding socket file name limit; test may fail!" >&2
60 fi
61
55 # The configuration directory, for import/export signing keys. 62 # The configuration directory, for import/export signing keys.
56 NIX_CONF_DIR="@GUIX_TEST_ROOT@/etc" 63 NIX_CONF_DIR="@GUIX_TEST_ROOT@/etc"
57 if [ ! -d "$NIX_CONF_DIR" ] 64 if [ ! -d "$NIX_CONF_DIR" ]