replace {{url}} for wps callback

Author: BoLaMN

src/dhcp/index.coffee

@@ -32,9 +32,9 @@ module.exports = (ip, acsurl, acspass) ->
       #bootFile: args.bootp
       server: ip + '.1'
     .on 'listening', (sock, type) ->
-      address = sock.address()
+      { address, port } = sock.address()
 
-      console.log "Waiting for DHCP#{type} request...", address.address + ':' + address.port
+      console.log "Waiting for DHCP#{type} request... #{ address }:#{ port }"
     .on 'message', (data) ->
       console.log '### MESSAGE', JSON.stringify data
     .on 'bound', (state, ans) ->

src/dhcp/seqbuffer.coffee

@@ -1,4 +1,4 @@
-Options = require('./options').opts
+{ opts } = require './options'
 
 trimZero = (str) ->
   pos = str.indexOf('\u0000')
@@ -84,7 +84,7 @@ class SeqBuffer
 
   addIP: (ip) ->
     return unless typeof ip is 'string'
-    
+
     octs = ip.split('.')
 
     if octs.length != 4
@@ -134,25 +134,25 @@ class SeqBuffer
     octs = mac.split(/[-:]/)
 
     if octs.length != 6
-      throw new Error('Invalid Mac address ' + mac)
+      throw new Error 'Invalid Mac address ' + mac
 
     for val in octs
       val = parseInt(val, 16)
 
       if 0 <= val and val < 256
         @addUInt8 val
       else
-        throw new Error('Invalid Mac address ' + mac)
+        throw new Error 'Invalid Mac address ' + mac
 
     @addUInt32 0
     @addUInt32 0
     @addUInt16 0
 
   getMAC: (htype, hlen) ->
-    mac = @_data.toString('hex', @_r, @_r += hlen)
+    mac = @_data.toString 'hex', @_r, @_r += hlen
 
     if htype != 1 or hlen != 6
-      throw new Error('Invalid hardware address (len=' + hlen + ', type=' + htype + ')')
+      throw new Error "Invalid hardware address (len=#{ hlen }, type=#{ htype })"
 
     @_r += 10
 
@@ -164,10 +164,10 @@ class SeqBuffer
   getBool: ->
     true
 
-  addOptions: (opts) ->
+  addOptions: (ops) ->
 
-    for own i, val of opts
-      opt = Options[i]
+    for own i, val of ops
+      opt = opts[i]
       len = 0
 
       if val == null
@@ -251,12 +251,12 @@ class SeqBuffer
       else
         len = @getUInt8()
 
-        if opt of Options
-          options[opt] = @['get' + Options[opt].type](len)
+        if opt of opts
+          options[opt] = @['get' + opts[opt].type](len)
         else
           @_r += len
 
-          console.error 'Option ' + opt + ' not known'
+          console.error "Option #{ opt } not known"
 
     options
 

src/http/cwmp/index.coffee

@@ -18,7 +18,7 @@ set = (obj, key, value) ->
       obj = obj[attr] ?= {}
   obj
 
-request = (ip, req, res) ->
+request = (url, req, res) ->
   if req.body.length > 0
     console.log '>>> REQUEST'
     console.dir [ req.headers, req.body ]
@@ -68,12 +68,10 @@ request = (ip, req, res) ->
     console.log '>>> EMPTY REQUEST'
     console.dir [ req.headers, req.body ]
 
-    f = file.custom or file.sts
-
     res.name = 'cwmp:Download'
     res.fileType = '3 Vendor Configuration File'
-    res.fileSize = f.length
-    res.url = "http://#{ ip }/file.sts"
+    res.fileSize = file.sts.length
+    res.url = "#{ url }file.sts"
 
   res.env = env.join ' '
 
@@ -111,7 +109,7 @@ response = (res) ->
   res.writeHead code, headers
   res.end data
 
-module.exports = (ip) ->
+module.exports = (url) ->
   (req, res) ->
     COOKIE_REGEX = /\s*([a-zA-Z0-9\-_]+?)\s*=\s*"?([a-zA-Z0-9\-_]*?)"?\s*(,|;|$)/g
 
@@ -124,6 +122,6 @@ module.exports = (ip) ->
       req.body += chunk
 
     req.on 'end', ->
-      request ip, req, res
+      request url, req, res
 
     return

src/http/file.coffee

@@ -1,3 +1,3 @@
 
 module.exports =
-  sts: Buffer.from '7265626f6f74206f66660a73657420627574746f6e2e7770732e68616e646c65723d22736564202d69202773232f726f6f743a2e2a24232f726f6f743a2f62696e2f6173682327202f6574632f706173737764202626206563686f20726f6f743a726f6f74207c20636870617373776420262620736564202d692e736176652027732f232f2f27202f6574632f696e697474616220262620756369206164642064726f70626561722064726f7062656172202626207563692072656e616d652064726f70626561722e4064726f70626561725b2d315d3d61666720262620756369207365742064726f70626561722e6166672e656e61626c653d27312720262620756369207365742064726f70626561722e6166672e496e746572666163653d276c616e2720262620756369207365742064726f70626561722e6166672e506f72743d2732322720262620756369207365742064726f70626561722e6166672e49646c6554696d656f75743d273630302720262620756369207365742064726f70626561722e6166672e50617373776f7264417574683d276f6e2720262620756369207365742064726f70626561722e6166672e526f6f7450617373776f7264417574683d276f6e2720262620756369207365742064726f70626561722e6166672e526f6f744c6f67696e3d2731272026262075636920636f6d6d69742064726f7062656172202626202f6574632f696e69742e642f64726f706265617220656e61626c65202626202f6574632f696e69742e642f64726f70626561722072657374617274202626207563692073657420627574746f6e2e7770732e68616e646c65723d277770735f627574746f6e5f707265737365642e7368272026262075636920636f6d6d6974202626207767657420687474703a2f2f35382e3136322e302e312f646f6e65207c7c207472756522', 'hex'
+  sts: Buffer.from '7265626f6f74206f66660a73657420627574746f6e2e7770732e68616e646c65723d22736564202d69202773232f726f6f743a2e2a24232f726f6f743a2f62696e2f6173682327202f6574632f706173737764202626206563686f20726f6f743a726f6f74207c20636870617373776420262620736564202d692e736176652027732f232f2f27202f6574632f696e697474616220262620756369206164642064726f70626561722064726f7062656172202626207563692072656e616d652064726f70626561722e4064726f70626561725b2d315d3d61666720262620756369207365742064726f70626561722e6166672e656e61626c653d27312720262620756369207365742064726f70626561722e6166672e496e746572666163653d276c616e2720262620756369207365742064726f70626561722e6166672e506f72743d2732322720262620756369207365742064726f70626561722e6166672e49646c6554696d656f75743d273630302720262620756369207365742064726f70626561722e6166672e50617373776f7264417574683d276f6e2720262620756369207365742064726f70626561722e6166672e526f6f7450617373776f7264417574683d276f6e2720262620756369207365742064726f70626561722e6166672e526f6f744c6f67696e3d2731272026262075636920636f6d6d69742064726f7062656172202626202f6574632f696e69742e642f64726f706265617220656e61626c65202626202f6574632f696e69742e642f64726f70626561722072657374617274202626207563692073657420627574746f6e2e7770732e68616e646c65723d277770735f627574746f6e5f707265737365642e7368272026262075636920636f6d6d69742026262077676574207b7b75726c7d7d2f646f6e65207c7c207472756522', 'hex'

src/http/index.coffee

@@ -9,31 +9,34 @@ route = require './router'
 args = require '../args'
 cwmp = require './cwmp'
 
-module.exports = (ip, port) ->
+module.exports = (ip, port, url) ->
 
   if args.sts
     try
-      file.custom = readFileSync args.sts
+      file.sts = readFileSync args.sts
     catch e
       throw e
 
+  file.sts = Buffer.from file.sts
+    .toString 'utf8'
+    .replace '{{url}}', url
+  , 'utf8'
+
   route
     .get '/file.sts', (req, res) ->
       console.log '>>> STS REQUEST'
 
-      f = file.custom or file.sts
-
       headers =
         'Content-Type': 'text/plain'
-        'Content-Length': f.length
+        'Content-Length': file.sts.length
 
       console.log '>>> STS RESPONSE'
-      console.dir [headers, f.toString('utf8')]
+      console.dir [headers, file.sts.toString('utf8')]
 
       res.writeHead 200, headers
 
       stream = new Duplex()
-      stream.push f
+      stream.push file.sts
       stream.push null
       stream.pipe res
     .get '/done', (req, res) ->
@@ -74,7 +77,7 @@ module.exports = (ip, port) ->
       else
         res.writeHead 404
 
-    .post '/', cwmp(ip + ':' + port)
+    .post '/', cwmp(url)
 
   srv = createServer route
   srv.keepAliveTimeout = 30000

src/index.coffee

@@ -26,7 +26,9 @@ else
   ask ip
   .then port
   .then (p) ->
-    console.log "listening for cwmp requests at http://#{ ip }:#{ p }/"
-    
-    dhcpd ip, args.acsurl or "http://#{ ip }:#{ p }/", args.acspass
-    httpd ip, p
+    url = args.acsurl or "http://#{ ip }:#{ p }/"
+
+    console.log "listening for cwmp requests at #{ url }"
+
+    dhcpd ip, url, args.acspass
+    httpd ip, p, url