cwmp 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjZmMzY4NjIxNGFmMGMxYjA0ZTMyNzE5YTQ4ZjgwYjRkZTc2NGYzNQ==
+    ZjYyNWVmZDgwODQ1OTA1MGUyMjhlZjRkOGJmODdiNjVmZDc0OTZmYQ==
   data.tar.gz: !binary |-
-    N2Y1ZjYwMjJmODE2ZDk2OTMxNjEwM2ZhMzU2MzIzNTVlYmE0MmY5Mg==
+    YTJhMTlmNjU3M2EzZmVmMmNiY2Q4ZGM4MTEwOTIyZjkzMzRhYWFmOQ==
 SHA512:
   metadata.gz: !binary |-
-    YjBmYjE3ZDg4NDVhODJiZDIyNDIwM2U1NzEyNzBiOTE3Y2UwNTNjOWFiMjAz
-    ZjgwYWI4MjliYzFiYjYxNzlkYTNjMjJhZjRlZDhkMmExNDczZDEzMTZlYzk2
-    ZWU0MjIwOGM5ZGIzMmI0ZjY3NmMxNTYxZmE5NDRjOGM1MDhiZDI=
+    NjU0Y2RiY2NmNzhkZTFmYmM2MGYzYThhYzNjYTA5ZDA3MjBkY2QzOTE1MDU5
+    ZDQ1MmI1MTFhMTQxMmIyNzNiMjQ3NDYyMWI2ODI0ZmI0NDdjZmIwZGMxNzg0
+    OGMxNzdiY2QxMzMwMmY2YWFhY2U4ZjRlYjUzYWQ3NTNkNGMzNDg=
   data.tar.gz: !binary |-
-    MjVhZjZlZGNmM2M2ZmNlYzAwYzkxYWI3NTk3ZjYyMTlmNGE5NTVmMDVhZmIy
-    Njc0MGQyMWIzMjMyNmNmOGJhOTgzM2NjOGY1Y2I5YzYwOTU0MDBmYWVjMDgz
-    NmMyMzEzMWVhNzQ1NjBjNjI2YTdlY2U0ZGRhMTYzMTlkYjRhMDQ=
+    MzgyZDhiYWM5ZmQ4YmFhZWY4YWEzYWI0NzgyNzIxMmVkODU3NjFjMWIwMmQx
+    MmEzZGI0ZjMxZTQ2YzkyYjM3ODM3MTEzZTZiMzRhNmQ0NTBjMjE5ZTFlNDlj
+    ZDI5MGY4YjIyNDJmZDBlZGU1NGYyNjhjNzJkY2VkZmUxMWRlNTc=

data/README.md

@@ -1,8 +1,8 @@
 # Ruby CWMP
 
-A ruby library to parse and generate CWMP messages. Includes an ACS server and a CPE simulator.
+A ruby library for parsing and crafting CWMP messages. Includes an ACS server and a CPE simulator.
 
-## Using the library to build CWMP messages
+## Crafting CWMP messages
 
 ```ruby
 require 'cwmp'

data/bin/acs

@@ -11,7 +11,5 @@ o.on('-v', '--version', 'Version') { puts "acs v#{Cwmp::VERSION}"; exit }
 o.parse!
 
 port = options['port'] || 9321
-
-puts "Starting ACS Daemon on http://localhost:#{port}"
 Cwmp::Acs.new(port).start
 

data/cwmp.gemspec

@@ -3,9 +3,9 @@ require './lib/cwmp/version'
 Gem::Specification.new do |spec|
     spec.name         = 'cwmp'
     spec.version      = Cwmp::VERSION
-    spec.date         = '2014-07-14'
+    spec.date         = Date.today.to_s
     spec.summary      = "A CWMP library"
-    spec.description  = "A ruby library to parse and generate CWMP messages. Includes an ACS server and a CPE simulator."
+    spec.description  = "A ruby library for parsing and crafting CWMP messages. Includes an ACS server and a CPE simulator."
     spec.authors      = ["Luca Cervasio"]
     spec.email        = 'luca.cervasio@gmail.com'
     spec.files        = `git ls-files`.split($/)

data/lib/cwmp/acs.rb

@@ -4,11 +4,31 @@ require 'thin'
 require 'http_router'
 require 'nokogiri'
 require 'readline'
+require 'digest'
 
+Thread::abort_on_exception = true
 
 module Cwmp
 
+    class AcsCpe
+        attr_accessor :serial, :conn_req, :queue, :session_cookie
+
+        def initialize serial
+            @serial = serial
+            @queue = Queue.new
+        end
+
+        def do_connection_request
+            c = HTTPClient.new
+            c.get @conn_req
+        end
+
+    end
+
     class Handler
+        def initialize obj
+            @acs = obj
+        end
 
         def call(env)
             req = Rack::Request.new(env)
@@ -17,8 +37,11 @@ module Cwmp
             if len == 0
                 message_type = ''
             else
-                doc = Nokogiri::XML(req.body.read)
-                message_type = doc.css("soap|Body").children.map(&:name)[1]
+                body = req.body.read
+                doc = Nokogiri::XML(body)
+                body =~ /(\w+):Envelope/
+                soap_ns = $1
+                message_type = doc.css("#{soap_ns}|Body")[0].element_children[0].name
             end
 
             if message_type == "Inform"
@@ -27,25 +50,54 @@ module Cwmp
                 serial_number = doc.css("SerialNumber").text
                 event_codes = doc.css("EventCode").map { |n| n.text }
                 parameters = {}
-                doc.css("ParameterValueStruct").map { |it| parameters[it.children[1].text] = it.children[3].text }
+                doc.css("ParameterValueStruct").map { |it| parameters[it.element_children[0].text] = it.element_children[1].text }
+
+                ck = Digest::MD5.hexdigest("#{serial_number}#{Time.new.to_i}")
 
+                if !@acs.cpes.has_key? serial_number
+                    cpe = AcsCpe.new serial_number
+                    cpe.conn_req = parameters['InternetGatewayDevice.ManagementServer.ConnectionRequestURL']
+                    cpe.session_cookie = ck
+                    @acs.cpes[serial_number] = cpe
+                end
                 puts "got Inform from #{req.ip}:#{req.port} [sn #{serial_number}] with eventcodes #{event_codes.join(", ")}"
 
                 inform_response = Cwmp::Message::inform_response
                 response = Rack::Response.new inform_response, 200, {'Connection' => 'Keep-Alive', 'Server' => 'ruby-cwmp'}
-                response.set_cookie("sessiontrack", {:value => "294823094lskdfsfsdf", :path => "/", :expires => Time.now+24*60*60})
+                response.set_cookie("sessiontrack", {:value => ck, :path => "/", :expires => Time.now+24*60*60})
                 response.finish
             elsif message_type == "TransferComplete"
                 puts "got TransferComplete"
             else
-                if message_type.include? "Response"
-                    puts "got #{message_type}"
-                elsif len == 0
+                if len == 0
                     puts "got Empty Post"
+                else
+                    puts "got #{message_type}"
+                    case message_type
+                        when "GetParameterValuesResponse"
+                            doc.css("ParameterValueStruct").each do |node|
+                                puts "#{node.element_children[0].text}: #{node.element_children[1].text}"
+                            end
+                        when "Fault"
+                            puts "#{doc.css("faultstring").text}: #{doc.css("FaultString").text}"
+                    end
+                end
+
+                cookie = req.cookies['sessiontrack']
+                @acs.cpes.each do |k,c|
+                    cpe = c if c.session_cookie = cookie
                 end
 
                 # Got Empty Post or a Response. Now check for any event to send, otherwise 204
-                [204, {"Connection" => "Close", 'Server' => 'ruby-cwmp'}, ""]
+                if cpe.queue.size > 0
+                    m = cpe.queue.pop
+                    response = Rack::Response.new m, 200, {'Connection' => 'Keep-Alive', 'Server' => 'ruby-cwmp'}
+                    response.finish
+                else
+                    puts "sending 204"
+                    [204, {"Connection" => "Close", 'Server' => 'ruby-cwmp'}, ""]
+                end
+
             end
         end
 
@@ -53,16 +105,20 @@ module Cwmp
 
 
     class Acs
+        attr_accessor :cpes
+
         def initialize (port)
+            ac = self
             @port = port
+            # @handler = Handler.new
             @app = HttpRouter.new do
                 # add('/api').to(SocketApp.new)
-                add('/acs').to(Handler.new)
+                add('/acs').to(Handler.new(ac))
             end
+            @cpes = {}
         end
 
         def start_cli
-
             list = [
                 'GetParameterValues', 'SetParameterValues', 'Reboot', 'FactoryReset', 'Download', 'AddObject', 'DeleteObject',
                 'help', 'quit', "waitMessage"
@@ -81,34 +137,29 @@ module Cwmp
                     when "help"
                         help
                     when "list"
-                        puts "list"
+                        p @cpes
+                    when /^get (\w+) (.+)/
+                        cpe = @cpes[$1]
+                        cpe.queue << Cwmp::Message::get_parameter_values($2)
+                        cpe.do_connection_request
+                    when /reboot (\w+)/
+                        cpe = @cpes[$1]
+                        cpe.queue << Cwmp::Message::reboot
+                        cpe.do_connection_request
                 end
             end
         end
 
         def start
+            puts "ACS #{Cwmp::VERSION} by Luca Cervasio <luca.cervasio@gmail.com>"
+            puts "Daemon running on http://localhost:#{@port}/acs"
             @web = Thread.new do
                 Thin::Logging.silent = true
                 Rack::Handler::Thin.run @app, :Port => @port
             end
 
-            Thread.new do
-                while true do
-                    sleep 1
-                    Readline.clear_rl
-                    puts "i"
-                    Readline.restore
-                end
-            end
             start_cli
         end
     end
 
-
-
-
-end
-
-
-
-
+end

data/lib/cwmp/cpe.rb

@@ -10,8 +10,8 @@ module Cwmp
             @acs_url = acs_url
             @serial = h[:serial] || "23434ds"
             @oui = h[:oui] || "006754"
-            @software_version = h[:software_version] || "0.1.1"
-            @manufacturer = h[:manufacturer] || "Moonar"
+            @software_version = h[:software_version] || Cwmp::VERSION
+            @manufacturer = h[:manufacturer] || "ruby-cwmp"
             @state = 'off'
             @periodic = Thread.new { periodic periodic } if periodic > 0
             @conn_req = Thread.new { connection_request }
@@ -86,12 +86,14 @@ module Cwmp
                 puts "sending Inform with event #{event}"
                 resp = c.post @acs_url, Cwmp::Message::inform(@manufacturer, @oui, @serial, event, @software_version), {'User-Agent' => "ruby-cwmp #{Cwmp::VERSION}", "Content-Type" => 'text/xml; charset="utf-8"'}
                 doc = Nokogiri::XML(resp.body)
-                message_type = doc.css("soapenv|Body").children.map(&:name)[1]
+                resp.body =~ /(\w+):Envelope/
+                soap_ns = $1
+                message_type = doc.css("#{soap_ns}|Body").children.map(&:name)[1]
                 puts "got #{message_type} message"
                 resp = c.post @acs_url, "", {'User-Agent' => "ruby-cwmp #{Cwmp::VERSION}", "Content-Type" => 'text/xml; charset="utf-8"'}
                 while resp.status != 204
                     doc = Nokogiri::XML(resp.body)
-                    message_type = doc.css("soapenv|Body").children.map(&:name)[1]
+                    message_type = doc.css("#{soap_ns}|Body").children.map(&:name)[1]
                     puts "got #{message_type}"
                     case message_type
                         when "GetParameterValues"

data/lib/cwmp/message.rb

@@ -76,6 +76,19 @@ module Cwmp
             return b.to_xml
         end
 
+        def self.reboot
+            b = Nokogiri::XML::Builder.new
+
+            b[:soap].Envelope(NAMESPACES) {
+                b[:soap].Header {}
+                b[:soap].Body {
+                    b[:cwmp].Reboot() {}
+                }
+            }
+
+            return b.to_xml
+        end
+
         def self.get_parameter_values (leaves)
             b = Nokogiri::XML::Builder.new
 

data/lib/cwmp/version.rb

@@ -1,3 +1,3 @@
 module Cwmp
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cwmp
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Luca Cervasio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -110,8 +110,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.4.0
-description: A ruby library to parse and generate CWMP messages. Includes an ACS server
-  and a CPE simulator.
+description: A ruby library for parsing and crafting CWMP messages. Includes an ACS
+  server and a CPE simulator.
 email: luca.cervasio@gmail.com
 executables:
 - acs