1
diff --git a/debian/changelog b/debian/changelog
2
index 5efc4bf..db1546d 100644
3
--- a/debian/changelog
4
+++ b/debian/changelog
5
@@ -1,3 +1,11 @@
6
1
autofs (5.1.2-3ubuntu2) cosmic; urgency=medium
7
2
8
3
  * Add DEP8 tests (LP: #1677751):
9
4
    - d/tests/control, d/tests/smb-mount: smb automount DEP8 test
10
5
    - d/tests/control, d/tests/nfs-mount: nfs automount DEP8 test
11
6
12
7
 -- Andreas Hasenack <andreas@canonical.com>  Tue, 12 Jun 2018 17:35:31 -0300
13
8
14
1
autofs (5.1.2-3ubuntu1) cosmic; urgency=medium
9
autofs (5.1.2-3ubuntu1) cosmic; urgency=medium
15
2
10
16
3
  * Merge with Debian unstable (LP: #1775232). Remaining changes:
11
  * Merge with Debian unstable (LP: #1775232). Remaining changes:
17
diff --git a/debian/tests/control b/debian/tests/control
18
4
new file mode 100644
12
new file mode 100644
19
index 0000000..0058590
20
--- /dev/null
21
+++ b/debian/tests/control
22
@@ -0,0 +1,7 @@
23
1
Tests: smb-mount
24
2
Depends: @, cifs-utils, samba, smbclient
25
3
Restrictions: isolation-machine, needs-root, allow-stderr
26
4
27
5
Tests: nfs-mount
28
6
Depends: @, nfs-common, nfs-server
29
7
Restrictions: isolation-machine, needs-root, allow-stderr
30
diff --git a/debian/tests/nfs-mount b/debian/tests/nfs-mount
31
0
new file mode 100644
8
new file mode 100644
32
index 0000000..f3ed7c1
33
--- /dev/null
34
+++ b/debian/tests/nfs-mount
35
@@ -0,0 +1,25 @@
36
1
#!/bin/sh
37
2
38
3
set -x
39
4
set -e
40
5
41
6
now=$(date --utc)
42
7
result=0
43
8
44
9
echo "creating /nfspub nfs export"
45
10
mkdir -p /nfspub
46
11
echo "${now} - This is an nfs public export" > /nfspub/nfs-public.txt
47
12
echo "/nfspub *(ro,no_subtree_check)" > /etc/exports
48
13
exportfs -avr
49
14
50
15
echo "Configuring automount for nfs on /net"
51
16
mkdir -p /etc/auto.master.d
52
17
echo '/net -hosts -intr,soft --timeout=180' > /etc/auto.master.d/net.autofs
53
18
systemctl restart autofs
54
19
55
20
echo "Accessing the autofs mountpoint"
56
21
timeout 30s grep -qE "${now}.*nfs public" /net/localhost/nfspub/nfs-public.txt || result=$?
57
22
if [ "$result" -ne "0" ]; then
58
23
    echo "test failed, couldn't access /net/localhost/nfspub/nfs-public.txt"
59
24
    exit ${result}
60
25
fi
61
diff --git a/debian/tests/smb-mount b/debian/tests/smb-mount
62
0
new file mode 100644
26
new file mode 100644
63
index 0000000..b9b685b
64
--- /dev/null
65
+++ b/debian/tests/smb-mount
66
@@ -0,0 +1,135 @@
67
1
#!/bin/sh
68
2
69
3
set -x
70
4
71
5
add_smb_share() {
72
6
    local share="$1"
73
7
    local sharepath="$2"
74
8
    local public="$3"
75
9
76
10
    if ! testparm -s 2>&1 | grep -qE "^\[${share}\]"; then
77
11
        echo "Adding [${share}] share"
78
12
        cat >> /etc/samba/smb.conf <<EOFEOF
79
13
[${share}]
80
14
  path = ${sharepath}
81
15
  read only = no
82
16
EOFEOF
83
17
    if [ "${public}" = "yes" ]; then
84
18
        cat >> /etc/samba/smb.conf <<EOFEOF
85
19
  guest ok = yes
86
20
EOFEOF
87
21
    else
88
22
        cat >> /etc/samba/smb.conf <<EOFEOF
89
23
  guest ok = no
90
24
EOFEOF
91
25
    fi
92
26
        systemctl reload smbd.service
93
27
    else
94
28
        echo "No need to add private [${share}] share, continuing."
95
29
    fi
96
30
}
97
31
98
32
create_user() {
99
33
    local username="$1"
100
34
    local password="$2"
101
35
102
36
    useradd -m "$username"
103
37
    echo "Setting samba password for the ${username} user"
104
38
    echo "${password}\n${password}" | smbpasswd -s -a ${username}
105
39
}
106
40
107
41
108
42
now=$(date --utc)
109
43
result=0
110
44
# Remount everything in case someone is running this interactively
111
45
# and mounts from previous runs and previous usernames are still lingering
112
46
systemctl restart autofs
113
47
114
48
echo "Setting up a public samba share in /pub"
115
49
mkdir -p /pub
116
50
echo "${now} - This is the public samba share." > /pub/hello-public.txt
117
51
add_smb_share pub /pub yes
118
52
119
53
echo "Setting up a private samba share in /private"
120
54
mkdir -p /private
121
55
echo "${now} - This is the private samba share." > /private/hello-private.txt
122
56
add_smb_share private /private no
123
57
124
58
username="smbtest$$"
125
59
password="$$"
126
60
echo "Creating a local test user called ${username}"
127
61
create_user "${username}" "${password}"
128
62
129
63
echo "Setting up autofs credentials for the private share"
130
64
mkdir -m 0700 -p /etc/creds
131
65
cat > /etc/creds/localhost <<EOFEOF
132
66
username=${username}
133
67
password=${password}
134
68
domain=WORKGROUP
135
69
EOFEOF
136
70
chmod 0600 /etc/creds/localhost
137
71
138
72
if ! grep -qE "^/cifs" /etc/auto.master; then
139
73
    echo "Configuring autofs for the /cifs mountpoint"
140
74
    echo "/cifs /etc/auto.smb --timeout=180" >> /etc/auto.master
141
75
    systemctl restart autofs
142
76
fi
143
77
144
78
# We use a trick here. By storing the credentials in /etc/creds/localhost,
145
79
# that means the autofs key is "localhost", and the credentials will be used
146
80
# when accessing /cifs/localhost.
147
81
# If instead we access /cifs/127.0.0.1, since there is no corresponding entry in
148
82
# /etc/creds, that access will be as a guest, i.e., with no credentials
149
83
echo "Testing authenticated share automount"
150
84
timeout 30s grep -qE "${now}.*private" /cifs/localhost/private/hello-private.txt || result=$?
151
85
if [ "$result" -ne "0" ]; then
152
86
    echo "test failed"
153
87
    exit ${result}
154
88
fi
155
89
156
90
echo "Confirming with smbstatus that an authenticated connection was used"
157
91
output=$(smbstatus 2>&1)
158
92
echo "${output}" | grep -q "${username}" || result=$?
159
93
if [ "${result}" -ne "0" ]; then
160
94
    echo "test failed"
161
95
    echo "smbstatus output:"
162
96
    echo "${smbstatus}"
163
97
    exit "${result}"
164
98
fi
165
99
166
100
echo "Confirming with mount -t cifs that the filesystem is mounted with authentication"
167
101
output=$(mount -t cifs 2>&1)
168
102
echo "${output}" | grep -qE "on /cifs/localhost/private.*username=${username}" || result=$?
169
103
if [ "${result}" -ne "0" ]; then
170
104
    echo "test failed"
171
105
    echo "mount -t cifs output:"
172
106
    echo "${output}"
173
107
    exit ${result}
174
108
fi
175
109
176
110
echo "Testing unauthenticated share automount"
177
111
timeout 30s grep -q "${now}.*public" /cifs/127.0.0.1/pub/hello-public.txt || result=$?
178
112
if [ "$result" -ne "0" ]; then
179
113
    echo "test failed"
180
114
    exit ${result}
181
115
fi
182
116
183
117
echo "Confirming with smbstatus that a guest connection was used"
184
118
output=$(smbstatus 2>&1)
185
119
echo "${output}" | grep -q nobody || result=$?
186
120
if [ "${result}" -ne "0" ]; then
187
121
    echo "test failed"
188
122
    echo "smbstatus output:"
189
123
    echo "${smbstatus}"
190
124
    exit ${result}
191
125
fi
192
126
193
127
echo "Confirming with mount -t cifs that the filesystem is mounted without authentication"
194
128
output=$(mount -t cifs 2>&1)
195
129
echo "${output}" | grep -qE "on /cifs/127.0.0.1/pub.*sec=none" || result=$?
196
130
if [ "${result}" -ne "0" ]; then
197
131
    echo "test failed"
198
132
    echo "mount -t cifs output:"
199
133
    echo "${output}"
200
134
    exit ${result}
201
135
fi
Reviewer	Date Requested	Status
Christian Ehrhardt  (community)	2018-06-12	Approve on 2018-06-13
Canonical Server	2018-06-12	Pending
Review via email: mp+347853@code.launchpad.net