1
diff --git a/cmd/service/service.go b/cmd/service/service.go
2
index c580f4a..ce92b7d 100644
3
--- a/cmd/service/service.go
4
+++ b/cmd/service/service.go
5
@@ -26,6 +26,7 @@ import (
6
26
	"path/filepath"
26
	"path/filepath"
7
27
	"time"
27
	"time"
8
28
28
9
29
	"github.com/godbus/dbus"
10
29
	"gopkg.in/tomb.v2"
30
	"gopkg.in/tomb.v2"
11
30
)
31
)
12
31
32
13
@@ -48,6 +49,8 @@ type service struct {
14
48
	listener net.Listener
49
	listener net.Listener
15
49
	router   *mux.Router
50
	router   *mux.Router
16
50
	ap       BackgroundProcess
51
	ap       BackgroundProcess
17
52
	dbusConn *dbus.Conn
18
53
	quit     chan int
19
51
}
54
}
20
52
55
21
53
func (c *serviceCommand) ServeHTTP(w http.ResponseWriter, r *http.Request) {
56
func (c *serviceCommand) ServeHTTP(w http.ResponseWriter, r *http.Request) {
22
@@ -100,26 +103,44 @@ func (s *service) setupAccesPoint() error {
23
100
}
103
}
24
101
104
25
102
func (s *service) Shutdown() {
105
func (s *service) Shutdown() {
30
103
	log.Println("Shutting down ...")
106
	s.quit <- 0
31
104
	s.listener.Close()
107
}
32
105
	s.tomb.Kill(nil)
108
33
106
	s.tomb.Wait()
109
func (s *service) createNetworkManagerMonitorCh() (chan *dbus.Signal, error) {
34
110
	var err error
35
111
	s.dbusConn, err = dbus.SystemBus()
36
112
	if err != nil {
37
113
		return nil, fmt.Errorf("Failed to connect to system bus: %v", err)
38
114
	}
39
115
40
116
	err = s.dbusConn.BusObject().Call("org.freedesktop.DBus.AddMatch", 0,
41
117
		"type='signal',path='/org/freedesktop/DBus',"+
42
118
			"interface='org.freedesktop.DBus',"+
43
119
			"sender='org.freedesktop.DBus',member='NameOwnerChanged',"+
44
120
			"arg0='org.freedesktop.NetworkManager'").Store()
45
121
	if err != nil {
46
122
		return nil, fmt.Errorf("Error when calling AddMatch: %v", err)
47
123
	}
48
124
49
125
	c := make(chan *dbus.Signal, 10)
50
126
	s.dbusConn.Signal(c)
51
127
52
128
	return c, nil
53
107
}
129
}
54
108
130
55
109
func (s *service) Run() error {
131
func (s *service) Run() error {
56
132
	s.quit = make(chan int)
57
110
	s.addRoutes()
133
	s.addRoutes()
58
111
	if err := s.setupAccesPoint(); err != nil {
59
112
		return err
60
113
	}
61
114
134
62
115
	var err error
135
	var err error
64
116
	if validTokens, err = loadValidTokens(filepath.Join(os.Getenv("SNAP"), "conf", "default-config")); err != nil {
136
	if validTokens, err = loadValidTokens(filepath.Join(os.Getenv("SNAP"),
65
137
		"conf", "default-config")); err != nil {
66
117
		log.Println("Failed to read default configuration:", err)
138
		log.Println("Failed to read default configuration:", err)
67
118
	}
139
	}
68
119
140
69
120
	// Create the socket directory and remove any stale socket
141
	// Create the socket directory and remove any stale socket
70
121
	path := filepath.Join(os.Getenv("SNAP_DATA"), socketPathSuffix)
142
	path := filepath.Join(os.Getenv("SNAP_DATA"), socketPathSuffix)
72
122
	if _, err := os.Stat(filepath.Dir(path)); os.IsNotExist(err) {
143
	if _, err = os.Stat(filepath.Dir(path)); os.IsNotExist(err) {
73
123
		os.Mkdir(filepath.Dir(path), 0755)
144
		os.Mkdir(filepath.Dir(path), 0755)
74
124
	}
145
	}
75
125
	os.Remove(path)
146
	os.Remove(path)
76
@@ -131,20 +152,57 @@ func (s *service) Run() error {
77
131
	}
152
	}
78
132
153
79
133
	s.tomb.Go(func() error {
154
	s.tomb.Go(func() error {
81
134
		err := s.server.Serve(s.listener)
155
		err = s.server.Serve(s.listener)
82
135
		if err != nil {
156
		if err != nil {
84
136
			return fmt.Errorf("Failed to server HTTP: %s", err)
157
			return fmt.Errorf("Failed to start service: %s", err)
85
137
		}
158
		}
87
138
		return nil
159
		return err
88
139
	})
160
	})
89
140
161
91
141
	s.tomb.Wait()
162
	nmChangeCh, err := s.createNetworkManagerMonitorCh()
92
163
	if err != nil {
93
164
		return err
94
165
	}
95
166
	if err = s.setupAccesPoint(); err != nil {
96
167
		return err
97
168
	}
98
142
169
101
143
	if s.ap.Running() {
170
	var errLp error
102
144
		s.ap.Stop()
171
monitorOut:
103
172
	for {
104
173
		select {
105
174
		case sign := <-nmChangeCh:
106
175
			if len(sign.Body) != 3 {
107
176
				errLp = fmt.Errorf("Bad number of args in " +
108
177
					"NameOwnerChanged signal")
109
178
				break monitorOut
110
179
			}
111
180
			newOwner, ok := sign.Body[2].(string)
112
181
			if ok == false {
113
182
				errLp = fmt.Errorf("Bad argument type in " +
114
183
					"NameOwnerChanged signal")
115
184
				break monitorOut
116
185
			}
117
186
			if newOwner != "" {
118
187
				log.Println("NetworkManager stopped -> started")
119
188
				s.ap.Stop()
120
189
				if errLp = s.setupAccesPoint(); errLp != nil {
121
190
					break monitorOut
122
191
				}
123
192
			}
124
193
		case <-s.quit:
125
194
			log.Println("Shutting down...")
126
195
			break monitorOut
127
196
		}
128
145
	}
197
	}
129
146
198
131
147
	return nil
199
	s.dbusConn.Close()
132
200
	s.listener.Close()
133
201
	s.tomb.Kill(nil)
134
202
	s.ap.Stop()
135
203
	s.tomb.Wait()
136
204
137
205
	return errLp
138
148
}
206
}
139
149
207
140
150
type tcpKeepAliveListener struct {
208
type tcpKeepAliveListener struct {
141
diff --git a/spread.yaml b/spread.yaml
142
index 3a743c0..3cbdb3b 100644
143
--- a/spread.yaml
144
+++ b/spread.yaml
145
@@ -43,7 +43,6 @@ prepare-each: |
146
43
  # Cleanup logs so we can just dump what has happened in the debug-each
43
  # Cleanup logs so we can just dump what has happened in the debug-each
147
44
  # step below after a test case ran.
44
  # step below after a test case ran.
148
45
  journalctl --rotate
45
  journalctl --rotate
149
46
  sleep .1
150
47
  journalctl --vacuum-time=1ms
46
  journalctl --vacuum-time=1ms
151
48
  dmesg -c > /dev/null
47
  dmesg -c > /dev/null
152
49
48
153
diff --git a/tests/lib/prepare-each.sh b/tests/lib/prepare-each.sh
154
index 7c9426a..c321930 100644
155
--- a/tests/lib/prepare-each.sh
156
+++ b/tests/lib/prepare-each.sh
157
@@ -1,4 +1,4 @@
159
1
#!/bin/sh
1
#!/bin/sh -x
160
2
. $TESTSLIB/utilities.sh
2
. $TESTSLIB/utilities.sh
161
3
3
162
4
# Powercycle both interface to get them back into a sane state before
4
# Powercycle both interface to get them back into a sane state before
163
@@ -14,3 +14,8 @@ snap remove wireless-tools
164
14
install_snap_under_test
14
install_snap_under_test
165
15
# Give wifi-ap a bit time to settle down to avoid clashed
15
# Give wifi-ap a bit time to settle down to avoid clashed
166
16
sleep 5
16
sleep 5
167
17
# hostapd fails due to a seccomp error in qemu. We need to re-start wifi-ap to
168
18
# have it back. This is probably a qemu/kvm bug, so we woraround the issue for
169
19
# the moment.
170
20
snap restart wifi-ap
171
21
sleep 10
172
diff --git a/tests/main/conf-from-gadget/task.yaml b/tests/main/conf-from-gadget/task.yaml
173
index e26d7bf..234515c 100644
174
--- a/tests/main/conf-from-gadget/task.yaml
175
+++ b/tests/main/conf-from-gadget/task.yaml
176
@@ -1,4 +1,5 @@
177
1
summary: Verify that the default SSID can be read from a gadget snap
1
summary: Verify that the default SSID can be read from a gadget snap
178
2
manual: true
179
2
description: |
3
description: |
180
3
    We check that we get the SSID name from the defaults in the gadget
4
    We check that we get the SSID name from the defaults in the gadget
181
4
    snap. To do this, we re-package the gadget snap in the store after
5
    snap. To do this, we re-package the gadget snap in the store after
182
diff --git a/tests/main/conf-wizard-disabled-from-gadget/task.yaml b/tests/main/conf-wizard-disabled-from-gadget/task.yaml
183
index 84cbbd3..5bc2974 100644
184
--- a/tests/main/conf-wizard-disabled-from-gadget/task.yaml
185
+++ b/tests/main/conf-wizard-disabled-from-gadget/task.yaml
186
@@ -1,4 +1,5 @@
187
1
summary: Verify the wizard can be disabled by default from a gadget snap
1
summary: Verify the wizard can be disabled by default from a gadget snap
188
2
manual: true
189
2
3
190
3
prepare: |
4
prepare: |
191
4
    . $TESTSLIB/snap-names.sh
5
    . $TESTSLIB/snap-names.sh
Reviewer	Review Type	Date Requested	Status
System Enablement Bot	continuous-integration	2018-03-26	Approve on 2018-03-27
Konrad Zapałowicz (community)	code		Approve on 2018-03-27
Review via email: mp+342117@code.launchpad.net