Implemented HTTP authentication for connection requests

api-functions.coffee

@@ -3,24 +3,26 @@ db = require './db'
 http = require 'http'
 common = require './common'
 util = require 'util'
+URL = require 'url'
+auth = require './auth'
 
 
 connectionRequest = (deviceId, callback) ->
-  db.devicesCollection.findOne({_id : deviceId}, {'InternetGatewayDevice.ManagementServer.ConnectionRequestURL._value' : 1}, (err, device)->
+  conReq = (url, authString, callback) ->
-    if err
+    if authString
-      callback(err)
+      url = URL.parse(url)
-      return
+      url.headers = {'Authorization' : authString}
-    connectionRequestUrl = device.InternetGatewayDevice.ManagementServer.ConnectionRequestURL._value
+
-    # for testing
+    request = http.get(url, (res) ->
-    #connectionRequestUrl = connectionRequestUrl.replace(/^(http:\/\/)([0-9\.]+)(\:[0-9]+\/[a-zA-Z0-9]+\/?$)/, '$110.1.1.254$3')
+      if res.statusCode == 401
-    request = http.get(connectionRequestUrl, (res) ->
+        authHeader = auth.parseAuthHeader(res.headers['www-authenticate'])
-      callback()
+      callback(res.statusCode, authHeader)
     )
 
     request.on('error', (err) ->
       # error event when request is aborted
       request.abort()
-      callback(err)
+      callback(0)
     )
 
     request.on('socket', (socket) ->
@@ -29,6 +31,29 @@ connectionRequest = (deviceId, callback) ->
         request.abort()
       )
     )
+
+  db.devicesCollection.findOne({_id : deviceId}, {'InternetGatewayDevice.ManagementServer.ConnectionRequestURL._value' : 1}, (err, device)->
+    if err
+      callback(err)
+      return
+    connectionRequestUrl = device.InternetGatewayDevice.ManagementServer.ConnectionRequestURL._value
+    # for testing
+    #connectionRequestUrl = connectionRequestUrl.replace(/^(http:\/\/)([0-9\.]+)(\:[0-9]+\/[a-zA-Z0-9]+\/?$)/, '$110.1.1.254$3')
+    conReq(connectionRequestUrl, null, (statusCode, authHeader) ->
+      if statusCode == 401
+        [username, password] = config.auth.connectionRequest(deviceId)
+        if authHeader.method is 'Basic'
+          authString = auth.basic(username, password)
+        else if authHeader.method is 'Digest'
+          uri = URL.parse(connectionRequestUrl)
+          authString = auth.digest(username, password, uri.path, 'GET', null, authHeader)
+
+        conReq(connectionRequestUrl, authString, (statusCode, authHeader) ->
+          callback()
+        )
+      else
+        callback()
+    )
   )
 
 

config.coffee

@@ -36,3 +36,6 @@ for k, v of parameters
 
 exports.PARAMETERS = parameters
 exports.ALIASES = aliases
+
+# load authentication scripts
+exports.auth = require('./config/auth')

config/auth.js

@@ -0,0 +1,4 @@
+exports.connectionRequest = function(deviceId) {
+  // return username/password pair for a given device
+  return ["", ""];
+}