Redesign auto accept

- Allow to change auto accept during runtime
- Update the mDNS Entry when changing the auto accept value
- Provide the proper register value of remote services
- A few renamings

Author: DerAndereAndi

api/hub.go

@@ -19,6 +19,11 @@ type HubInterface interface {
 	// Provide the current pairing state for a SKI
 	PairingDetailForSki(ski string) *ConnectionStateDetail
 
+	// Enables or disables to automatically accept incoming pairing and connection requests
+	//
+	// Default: false
+	SetAutoAccept(bool)
+
 	// Pair with the SKI
 	RegisterRemoteSKI(ski string)
 

api/servicedetails.go

@@ -26,8 +26,8 @@ type ServiceDetails struct {
 	// The EEBUS device type of the device model
 	deviceType string
 
-	// Flags if the service auto auto accepts other services
-	registerAutoAccept bool
+	// Flags if the service auto accepts other services
+	autoAccept bool
 
 	// Flags if the service is trusted and should be reconnected to
 	// Should be enabled after the connection process resulted
@@ -100,18 +100,18 @@ func (s *ServiceDetails) SetDeviceType(deviceType string) {
 	s.deviceType = deviceType
 }
 
-func (s *ServiceDetails) RegisterAutoAccept() bool {
+func (s *ServiceDetails) AutoAccept() bool {
 	s.mux.Lock()
 	defer s.mux.Unlock()
 
-	return s.registerAutoAccept
+	return s.autoAccept
 }
 
-func (s *ServiceDetails) SetRegisterAutoAccept(value bool) {
+func (s *ServiceDetails) SetAutoAccept(value bool) {
 	s.mux.Lock()
 	defer s.mux.Unlock()
 
-	s.registerAutoAccept = value
+	s.autoAccept = value
 }
 
 func (s *ServiceDetails) Trusted() bool {

api/servicedetails_test.go

@@ -39,8 +39,8 @@ func (s *ServiceDetailsSuite) Test_ServiceDetails() {
 	details.SetDeviceType("devicetype")
 	assert.Equal(s.T(), "devicetype", details.DeviceType())
 
-	details.SetRegisterAutoAccept(true)
-	assert.Equal(s.T(), true, details.RegisterAutoAccept())
+	details.SetAutoAccept(true)
+	assert.Equal(s.T(), true, details.AutoAccept())
 
 	details.SetTrusted(true)
 	assert.Equal(s.T(), true, details.Trusted())

hub/hub.go

@@ -40,6 +40,8 @@ type Hub struct {
 
 	hubReader api.HubReaderInterface
 
+	autoaccept bool
+
 	// The list of known remote services
 	remoteServices map[string]*api.ServiceDetails
 

hub/hub_mdns.go

@@ -32,6 +32,8 @@ func (h *Hub) ReportMdnsEntries(entries map[string]*api.MdnsEntry) {
 			continue
 		}
 
+		service.SetAutoAccept(entry.Register)
+
 		// patch the addresses list if an IPv4 address was provided
 		if service.IPv4() != "" {
 			if ip := net.ParseIP(service.IPv4()); ip != nil {

hub/hub_pairing.go

@@ -63,6 +63,23 @@ func (h *Hub) mapShipMessageExchangeState(state model.ShipMessageExchangeState,
 	return connState
 }
 
+func (h *Hub) SetAutoAccept(autoaccept bool) {
+	h.muxReg.Lock()
+	defer h.muxReg.Unlock()
+
+	h.autoaccept = autoaccept
+
+	h.mdns.SetAutoAccept(autoaccept)
+}
+
+// check if auto accept is true
+func (h *Hub) IsAutoAcceptEnabled() bool {
+	h.muxReg.Lock()
+	defer h.muxReg.Unlock()
+
+	return h.autoaccept
+}
+
 func (h *Hub) checkHasStarted() bool {
 	h.muxStarted.Lock()
 	defer h.muxStarted.Unlock()

hub/hub_shipconnection.go

@@ -17,11 +17,6 @@ func (h *Hub) IsRemoteServiceForSKIPaired(ski string) bool {
 	return service.Trusted()
 }
 
-// check if auto accept is true
-func (h *Hub) IsAutoAcceptEnabled() bool {
-	return h.localService.RegisterAutoAccept()
-}
-
 // report closing of a connection and if handshake did complete
 func (h *Hub) HandleConnectionClosed(connection api.ShipConnectionInterface, handshakeCompleted bool) {
 	remoteSki := connection.RemoteSKI()

hub/hub_test.go

@@ -128,6 +128,16 @@ func (s *HubSuite) Test_NewConnectionsHub() {
 	hub.Shutdown()
 }
 
+func (s *HubSuite) Test_AutoAccept() {
+	s.sut.SetAutoAccept(true)
+	value := s.sut.IsAutoAcceptEnabled()
+	assert.True(s.T(), value)
+
+	s.sut.SetAutoAccept(false)
+	value = s.sut.IsAutoAcceptEnabled()
+	assert.False(s.T(), value)
+}
+
 func (s *HubSuite) Test_SetupRemoteDevice() {
 	ski := "12af9e"
 	localService := api.NewServiceDetails(ski)

mdns/mdns.go

@@ -191,7 +191,7 @@ func (m *MdnsManager) Shutdown() {
 // A CEM service should always invoke this on startup
 // Any other service should only invoke this whenever it is not connected to a CEM service
 func (m *MdnsManager) AnnounceMdnsEntry() error {
-	if m.isAnnounced || m.mdnsProvider == nil {
+	if m.mdnsProvider == nil {
 		return nil
 	}
 
@@ -236,7 +236,16 @@ func (m *MdnsManager) UnannounceMdnsEntry() {
 
 func (m *MdnsManager) SetAutoAccept(accept bool) {
 	m.autoaccept = accept
-	// TODO: if changed, also change the mDNS registry
+
+	// if announcement is off, don't enforce a new announcement
+	if !m.isAnnounced {
+		return
+	}
+
+	// Update the announcement as autoaccept changed
+	if err := m.AnnounceMdnsEntry(); err != nil {
+		logging.Log().Debug("mdns: changing mdns entry failed", err)
+	}
 }
 
 func (m *MdnsManager) mdnsEntries() map[string]*api.MdnsEntry {

mdns/mdns_test.go

@@ -31,6 +31,7 @@ func (s *MdnsSuite) BeforeTest(suiteName, testName string) {
 	s.mdnsService = mocks.NewMdnsInterface(s.T())
 
 	s.mdnsSearch = mocks.NewMdnsReportInterface(s.T())
+	s.mdnsSearch.On("ReportMdnsEntries", mock.Anything).Maybe().Return()
 
 	s.mdnsProvider = mocks.NewMdnsProviderInterface(s.T())
 	s.mdnsProvider.On("ResolveEntries", mock.Anything, mock.Anything).Maybe().Return()
@@ -63,6 +64,10 @@ func (s *MdnsSuite) Test_GoZeroConfOnly() {
 
 	err := s.sut.Start(s.mdnsSearch)
 	assert.Nil(s.T(), err)
+	assert.False(s.T(), s.sut.autoaccept)
+
+	s.sut.SetAutoAccept(true)
+	assert.True(s.T(), s.sut.autoaccept)
 }
 
 func (s *MdnsSuite) Test_Start() {