X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fagent%2Fwebserver.go;h=3622efedb7b5fdf83372094946dbf90ea8a9c0ae;hb=82ede02a56e12026b2dfb1baeacabfbd564006b1;hp=ead06d1e40a68dc259189db1833136fe5e83eb74;hpb=97ca1f277dc8b6973d6fa67add5593a9c395ce60;p=src%2Fxds%2Fxds-agent.git

diff --git a/lib/agent/webserver.go b/lib/agent/webserver.go
index ead06d1..3622efe 100644
--- a/lib/agent/webserver.go
+++ b/lib/agent/webserver.go
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2017 "IoT.bzh"
+ * Author Sebastien Douheret <sebastien@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package agent
 
 import (
@@ -11,6 +28,7 @@ import (
 	"github.com/gin-contrib/static"
 	"github.com/gin-gonic/gin"
 	"github.com/googollee/go-socket.io"
+	"github.com/iotbzh/xds-agent/lib/xaapiv1"
 )
 
 // WebServer .
@@ -148,11 +166,9 @@ func (s *WebServer) middlewareXDSDetails() gin.HandlerFunc {
 	}
 }
 
-/* SEB
 func (s *WebServer) isValidAPIKey(key string) bool {
-	return (key == s.Config.FileConf.XDSAPIKey && key != "")
+	return (s.Config.FileConf.XDSAPIKey != "" && key == s.Config.FileConf.XDSAPIKey)
 }
-*/
 
 func (s *WebServer) middlewareCSRF() gin.HandlerFunc {
 	return func(c *gin.Context) {
@@ -229,11 +245,12 @@ func (s *WebServer) socketHandler(c *gin.Context) {
 	}
 
 	s.sIOServer.On("connection", func(so socketio.Socket) {
-		s.Log.Debugf("WS Connected (SID=%v)", so.Id())
+		s.Log.Debugf("WS Connected (WSID=%s, SID=%s)", so.Id(), sess.ID)
 		s.sessions.UpdateIOSocket(sess.ID, &so)
 
 		so.On("disconnection", func() {
-			s.Log.Debugf("WS disconnected (SID=%v)", so.Id())
+			s.Log.Debugf("WS disconnected (WSID=%s, SID=%s)", so.Id(), sess.ID)
+			s.events.UnRegister(xaapiv1.EVTAll, sess.ID)
 			s.sessions.UpdateIOSocket(sess.ID, nil)
 		})
 	})