freebox_api 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZTRhOTA2NWI2NTZhM2E1NGEwMzA1MzE4OGRhMzhlZWNmNDE1MTljNg==
+  data.tar.gz: !binary |-
+    YzAwZmY4YzI2MzFlODliOTE3NTljOGJiNTliYTQxMDE3NDRkNDY2Nw==
+SHA512:
+  metadata.gz: !binary |-
+    NDcyYjNhNTRhYWZhZTRmMjBjZDFkMWE5ZTI1MGM3YjVmOTIwOWM4ZmM0N2U3
+    NDgyY2Q1MzRmMTRkZjAxOWZjYjhiNWFlNjBiMTFkZDA4ZGMxN2M3ZWE4ZGI2
+    MTJhMGM0MTBlNjQ5MjcyYWU4YjgzMjQzOGNjMWJmYzg2MzE3ODE=
+  data.tar.gz: !binary |-
+    MWZiZGYxYjk1YTY0ZGRmZjNiMDMzZWQ2MmFkMTJiNzQ2NTdmNTNkODc0Nzg3
+    M2Q0YThjYzliNjEzZDk3OTFmNWIwY2JhYmI0ZGY0YzM1NWVlOTAwZTdjYzM4
+    NWY2MDFhNzI4MWJjNzNhMDA0ZTg5MjM2MGVjNTI5YTY2MjYwOGU=

data/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!) The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.

data/README.md

@@ -5,73 +5,210 @@ WARNING: Work In Progress.
 
 Overview
 --------
-
 This gem contains Freebox OS API bindings for the Ruby language.
 I started working on that to use it with https://github.com/mcanevet/puppet-freebox
 
-Obtaining an app\_token
------------------------
+Building the Freebox object
+---------------------------
 
 ```ruby
 require 'freebox_api'
 
-puts FreeboxApi::Freebox.app_token('fr.freebox.testapp', 'Test App', '0.0.7', 'Pc de Xavier')
+myFreebox = FreeboxApi::Freebox.new
 ```
 
-Initialize application
-----------------------
+or
 
 ```ruby
 require 'freebox_api'
 
-mafreebox = FreeboxApi::Freebox.new('dyNYgfK0Ya6FWGqq83sBHa7TwzWo+pg4fDFUJHShcjVYzTfaRrZzm93p7OTAfH/0', 'fr.freebox.testapp', 'Test App', '0.0.7', 'Pc de Xavier', 'http://mafreebox.example.com:4242')
+myFreebox = FreeboxApi::Freebox.new({
+  :freebox_ip   => 'mafreebox.example.com',
+  :freebox_port => 4242,
+})
+```
+
+Login
+-----
+
+### Obtaining an app\_token
+
+#### Request authorization
+
+This is the first step, the app will ask for an app\_token using the following call. A message will be displayed on the Freebox LCD asking the user to grant/deny access to the requesting app.
+
+Once the app has obtained a valid app\_token, it will not have to do this procedure again unless the user revokes the app\_token.
+
+```ruby
+token_request = {
+  :app_id      => 'fr.freebox.testapp',
+  :app_name    => 'Test App',
+  :app_version => '0.0.7',
+  :device_name => 'Pc de Xavier'
+}
+
+auth_request = myFreebox.authorize(token_request)
+
+app_token = auth_request['app_token']
+```
+
+#### Track authorization progress
+
+```ruby
+puts myFreebox.track_auth(auth_request['track_id'])
+```
+
+### Obtaining a session\_token
+
+```ruby
+myApp = {
+  :app_id      => 'fr.freebox.testapp',
+  :app_version => '0.0.7',
+  :app_token   => 'dyNYgfK0Ya6FWGqq83sBHa7TwzWo+pg4fDFUJHShcjVYzTfaRrZzm93p7OTAfH/0',
+}
+mySession = FreeboxApi::Session.new(myApp, myFreebox)
 ```
 
-Get the current challenge
--------------------------
+#### Getting the current challenge value
 
 ```ruby
-puts mafreebox.challenge
+myFreebox.challenge
 ```
 
-Get the current password
-------------------------
+#### Opening a session
 
 ```ruby
-puts mafreebox.password
+mySession.session_token
 ```
 
-Get the current session\_token
------------------------------
+LAN Browser
+-----------
+
+### Getting the list of browsable LAN interfaces
 
 ```ruby
-puts mafreebox.session_token
+interfaces = FreeboxApi::Resources::Interface.new(mySession)
+interfaces.index
 ```
 
-Get the list of browsable LAN interfaces
-----------------------------------------
+### Getting the list of hosts
 
 ```ruby
-puts mafreebox.interfaces
+lan_hosts = FreeboxApi::Resources::LanHost.new(mySession)
+lan_hosts.index
 ```
 
-Get the list of LAN hosts
--------------------------
+### Getting an host information
 
 ```ruby
-puts mafreebox.lan_hosts
+lan_hosts.show('ether-00:24:d4:7e:00:4c')
 ```
 
-Get the list of DHCP static leases
-----------------------------------
+### Updating an host information
+
+```ruby
+lan_hosts.update({
+  :id           => 'ether-00:24:d4:7e:00:4c',
+  :primary_name => 'Freebox Tv',
+})
+```
+
+DHCP
+----
+
+### Get the list of DHCP static leases
+
+```ruby
+static_leases = FreeboxApi::Resources::StaticLease.new(mySession)
+static_leases.index
+```
+
+### Get a given DHCP static lease
+
+```ruby
+static_leases.show('00:DE:AD:B0:0B:55)
+```
+
+### Update DHCP static lease
+
+```ruby
+static_leases.update({
+  :id      => '00:DE:AD:B0:0B:55',
+  :comment => 'Mon PC',
+})
+```
+
+### Delete a DHCP static lease
+
+```ruby
+static_lease.destroy('00:DE:AD:B0:0B:55')
+```
+
+### Add a DHCP static lease
+```ruby
+static_lease.create({
+  :ip  => '192.168.1.222',
+  :mac => '00:00:00:11:11:11',
+})
+```
+
+Port Forwarding
+---------------
+
+### Getting the list of port forwarding
+
+```ruby
+port_forwardings = FreeboxApi::Resources::PortForwarding.new(mySession)
+port_forwardings.index
+```
+
+### Getting a specific port forwarding
+
+```ruby
+port_forwardings.show(1)
+```
+
+### Updating a port forwarding
+
+```ruby
+port_forwardings.update({
+  :id      => 1,
+  :enabled => false,
+})
+```
+
+### Add a port forwarding
+
+```ruby
+port_forwardings.create({
+  :enabled        => true,
+  :comment        => 'test',
+  :lan_port       => 4242,
+  :wan_port_end   => 4242,
+  :wan_port_start => 4242,
+  :lan_ip         => '192.168.1.42',
+  :ip_proto       => 'tcp',
+})
+```
+
+### Delete a port forwarding
+
+```ruby
+port_forwardings.destroy(3)
+```
+
+UPnP IGD
+--------
+
+### Get the list of current redirection
 
 ```ruby
-puts mafreebox.static_leases
+upnp_redir = FreeboxApi::Resources::UPnPRedir.new(mySession)
+upnp_redir.index
 ```
 
-Get the list of Port Forwardings
---------------------------------
+### Delete a redirection
 
 ```ruby
-puts mafreebox.redirs
+upnp_redir.destroy('0.0.0.0-53644-udp')
 ```

data/lib/freebox_api.rb

@@ -1,120 +1,8 @@
-require 'rest_client'
-require 'json'
-
 module FreeboxApi
-
-  class Freebox
-
-    attr_reader :app_token, :app_id, :app_name, :app_version, :device_name, :base_url
-
-    def initialize(app_token, app_id, app_name, app_version, device_name, base_url = 'http://mafreebox.free.fr')
-      @app_id = app_id
-      @app_name = app_name
-      @app_version = app_version
-      @device_name = device_name
-      @app_token = app_token
-      @base_url = base_url
-    end
-
-    def self.app_token(app_id, app_name, app_version, device_name)
-      JSON.parse(RestClient.post(
-        "#{@base_url}/api/v1/login/authorize",
-        {
-          :app_id      => app_id,
-          :app_name    => app_name,
-          :app_version => app_version,
-          :device_name => device_name,
-        }.to_json,
-        :content_type => :json,
-        :accept => :json
-      ))['result']['app_token']
-    end
-
-    def challenge
-      JSON.parse(RestClient.get("#{@base_url}/api/v1/login/"))['result']['challenge']
-    end
-
-    def password
-      Digest::HMAC.hexdigest(challenge, @app_token, Digest::SHA1)
-    end
-
-    def session_token
-      JSON.parse(
-        RestClient.post(
-          "#{@base_url}/api/v1/login/session/",
-          {
-            :app_id   => @app_id,
-            :password => password,
-          }.to_json,
-          :content_type => :json,
-          :accept => :json
-        )
-      )['result']['session_token']
-    end
-
-    def interfaces
-      JSON.parse(
-        RestClient.get(
-          "#{@base_url}/api/v1/lan/browser/interfaces",
-          :'X_Fbx_App_Auth' => session_token
-        )
-      )['result'].collect { |interface|
-        FreeboxApi::Resources::Interface.new(interface['name'], interface['host_count'], self)
-      }
-    end
-
-    def lan_hosts
-      interfaces.collect { |interface|
-        interface.lan_hosts
-      }.flatten
-    end
-
-    def static_leases
-      JSON.parse(
-        RestClient.get(
-          "#{@base_url}/api/v1/dhcp/static_lease/",
-          :'X_Fbx_App_Auth' => session_token
-        )
-      )['result'].collect { |static_lease|
-        FreeboxApi::Resources::StaticLease.new(
-          static_lease['id'],
-          static_lease['mac'],
-          static_lease['comment'],
-          static_lease['hostname'],
-          static_lease['ip'],
-          lan_hosts.select { |lan_host| lan_host.id == static_lease['host']['id'] },
-          self
-        )
-      }
-    end
-
-    def redirs
-      JSON.parse(
-        RestClient.get(
-          "#{@base_url}/api/v1/fw/redir/",
-          :'X_Fbx_App_Auth' => session_token
-        )
-      )['result'].collect { |redir|
-        FreeboxApi::Resources::Redir.new(
-          redir['id'],
-          redir['enabled'],
-          redir['ip_proto'],
-          redir['wan_port_start'],
-          redir['wan_port_end'],
-          redir['lan_ip'],
-          redir['lan_port'],
-          redir['hostname'],
-          lan_hosts.select { |lan_host| lan_host.id == redir['host']['id'] },
-          redir['comment'],
-          self
-        )
-      }
-    end
-
-  end
-
 end
 
+require 'freebox_api/freebox'
+require 'freebox_api/session'
 require 'freebox_api/version'
 resource_files = Dir[File.expand_path("#{File.dirname(__FILE__)}/freebox_api/resources/*.rb", __FILE__)]
 resource_files.each { |f| require f }

data/lib/freebox_api/application.rb

@@ -0,0 +1,15 @@
+require 'rest_client'
+require 'json'
+
+module FreeboxApi
+
+  class Application < Hash
+
+    def initialize(hash = {})
+      self[:app_id] = hash[:app_id]
+      self[:app_token] = hash[:app_token]
+    end
+
+  end
+
+end

data/lib/freebox_api/freebox.rb

@@ -0,0 +1,56 @@
+require 'rest_client'
+require 'json'
+
+module FreeboxApi
+
+  class Freebox < Hash
+
+    def initialize(hash = {})
+      self[:freebox_ip] = hash[:freebox_ip] ? hash[:freebox_ip] : 'mafreebox.free.fr'
+      self[:freebox_port] = hash[:freebox_port] ? hash[:freebox_port] : '80'
+      @client = RestClient::Resource.new("http://#{self[:freebox_ip]}:#{self[:freebox_port]}")
+      self[:uid] = discover['uid']
+      self[:device_name] = discover['device_name']
+      self[:api_version] = discover['api_version']
+      self[:api_base_url] = discover['api_base_url']
+      self[:device_type] = discover['device_type']
+    end
+
+    def discover
+      args = ['get']
+      @discover ||= JSON.parse(@client['/api_version'].send(*args))
+    end
+
+    def build_url(api_url)
+      "#{self[:api_base_url]}v#{self[:api_version].split('.')[0]}#{api_url}"
+    end
+
+    def authorize(token_request)
+      http_call('post', '/login/authorize/', token_request)
+    end
+
+    def track_auth(track_id)
+      http_call('get', "/login/authorize/#{track_id}")
+    end
+
+    def challenge
+      http_call('get', '/login/')['challenge']
+    end
+
+    def http_call(http_method, path, params = {}, session = nil)
+      headers = {}
+
+      args = [http_method]
+      if %w[post put].include?(http_method.to_s)
+        args << params.to_json
+      else
+        headers[:params] = params if params
+      end
+      headers[:'X_Fbx_App_Auth'] = session.session_token if session
+      args << headers if headers
+      JSON.parse(@client[build_url(path)].send(*args))['result']
+    end
+
+  end
+
+end

data/lib/freebox_api/resources/interface.rb

@@ -4,38 +4,12 @@ module FreeboxApi
 
     class Interface
 
-      attr_reader :name, :host_count
-
-      def initialize(name, host_count, freebox)
-        @name = name
-	@host_count = host_count
-	@freebox = freebox
+      def initialize(session)
+        @session = session
       end
 
-      def lan_hosts
-        JSON.parse(
-          RestClient.get(
-            "#{@freebox.base_url}/api/v1/lan/browser/#{@name}",
-            :'X_Fbx_App_Auth' => @freebox.session_token
-          )
-	)['result'].collect { |lan_host|
-          FreeboxApi::Resources::LanHost.new(
-            lan_host['id'],
-            lan_host['primary_name'],
-            lan_host['host_type'],
-            lan_host['primary_name_manual'],
-            lan_host['l2ident'],
-            lan_host['vendor_name '],
-            lan_host['persistent'],
-            lan_host['reachable'],
-            lan_host['last_time_reachable'],
-            lan_host['active'],
-            lan_host['last_activity'],
-            lan_host['names'],
-            lan_host['l3connectivities'],
-            self,
-            @freebox)
-	}
+      def index
+        @session.http_call('get', '/lan/browser/interfaces')
       end
 
     end

data/lib/freebox_api/resources/lan_host.rb

@@ -4,35 +4,26 @@ module FreeboxApi
 
     class LanHost
 
-      attr_reader :id, :primary_name, :host_type, :primary_name_manual, :l2ident, :vendor_name, :persistent, :reachable, :last_time_reachable, :active, :last_activity, :names, :l3connectivities, :interface
-
-      def initialize(id, primary_name, host_type, primary_name_manual, l2ident, vendor_name, persistent, reachable, last_time_reachable, active, last_activity, names, l3connectivities, interface, freebox)
-        @id = id
-	@primary_name = primary_name
-	@host_type = host_type
-	@primary_name_manual = primary_name_manual
-        @l2ident = l2ident
-        @vendor_name = vendor_name
-        @persistent = persistent
-        @reachable = reachable
-        @last_time_reachable = last_time_reachable
-        @active = active
-        @last_activity = last_activity
-        @names = names
-        @l3connectivities = l3connectivities
-        @interface = interface
-        @freebox = freebox
+      def initialize(session)
+        @session = session
       end
 
-      def static_leases
-        @freebox.static_leases.select { |static_lease|
-          static_lease.host == self
-        }
+      def index
+        Interface.new(@session).index.collect { |interface|
+          @session.http_call('get', "/lan/browser/#{interface['name']}")
+	}.flatten
       end
 
+      def show(id, interface = 'pub')
+        @session.http_call('get', "/lan/browser/#{interface}/#{id}/")
+      end
+
+      def update(params = {}, interface = 'pub')
+        @session.http_call('put', "/lan/browser/#{interface}/#{params['id']}", params)
+      end
+      
     end
-    
+
   end
 
 end
-

data/lib/freebox_api/resources/port_forwarding.rb

@@ -0,0 +1,35 @@
+module FreeboxApi
+
+  module Resources
+
+    class PortForwarding
+
+      def initialize(session)
+        @session = session
+      end
+
+      def index
+        @session.http_call('get', '/fw/redir/')
+      end
+
+      def show(id)
+        @session.http_call('get', "/fw/redir/#{id}")
+      end
+
+      def update(params = {})
+        @session.http_call('put', "/fw/redir/#{params['id']}", params)
+      end
+
+      def destroy(id)
+        @session.http_call('delete', "/fw/redir/#{id}")
+      end
+
+      def create(params = {})
+        @session.http_call('post', '/fw/redir/', params)
+      end
+
+    end
+
+  end
+
+end

data/lib/freebox_api/resources/static_lease.rb

@@ -4,15 +4,28 @@ module FreeboxApi
 
     class StaticLease
 
-      attr_reader :id, :mac, :comment, :hostname, :ip, :host
-
-      def initialize(id, mac, comment, hostname, ip, host, freebox)
-        @id = id
-        @mac = mac
-        @hostname = hostname
-        @ip = ip
-        @host = host
-        @freebox = freebox
+      def initialize(session)
+        @session = session
+      end
+
+      def index
+        @session.http_call('get', '/dhcp/static_lease/')
+      end
+
+      def show(id)
+        @session.http_call('get', "/dhcp/static_lease/#{id}")
+      end
+
+      def update(params = {})
+        @session.http_call('put', "/dhcp/static_lease/#{params['id']}", params)
+      end
+
+      def destroy(id)
+        @session.http_call('delete', "/dhcp/static_lease/#{id}")
+      end
+
+      def create(params = {})
+        @session.http_call('post', '/dhcp/static_lease/', params)
       end
 
     end

data/lib/freebox_api/resources/upnp_redir.rb

@@ -0,0 +1,23 @@
+module FreeboxApi
+
+  module Resources
+
+    class UPnPRedir
+
+      def initialize(session)
+        @session = session
+      end
+
+      def index
+        @session.http_call('get', '/upnpigd/redir/')
+      end
+
+      def destroy(id)
+        @session.http_call('delete', "/upnpigd/redir/#{id}")
+      end
+
+    end
+  
+  end
+
+end

data/lib/freebox_api/session.rb

@@ -0,0 +1,25 @@
+module FreeboxApi
+
+  class Session
+
+    def initialize(app, freebox)
+      @app = app
+      @freebox = freebox
+    end
+
+    def password
+      Digest::HMAC.hexdigest(@freebox.challenge, @app[:app_token], Digest::SHA1)
+    end
+
+    def session_token
+      @freebox.http_call('post', '/login/session/',
+        {:app_id => @app[:app_id], :password => password}, nil)['session_token']
+    end
+
+    def http_call(http_method, path, params = {})
+      @freebox.http_call(http_method, path, params, self)
+    end
+
+  end
+
+end

data/lib/freebox_api/version.rb

@@ -1,3 +1,3 @@
 module FreeboxApi
-  VERSION = "0.0.1"
+  VERSION = '0.0.2'
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: freebox_api
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - Mickaël Canévet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -50,36 +45,40 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- LICENSE
 - README.md
 - freebox_api.gemspec
 - lib/freebox_api.rb
+- lib/freebox_api/application.rb
+- lib/freebox_api/freebox.rb
 - lib/freebox_api/resources/interface.rb
 - lib/freebox_api/resources/lan_host.rb
-- lib/freebox_api/resources/redir.rb
+- lib/freebox_api/resources/port_forwarding.rb
 - lib/freebox_api/resources/static_lease.rb
+- lib/freebox_api/resources/upnp_redir.rb
+- lib/freebox_api/session.rb
 - lib/freebox_api/version.rb
 homepage: http://github.com/mcanevet/freebox_api
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby bindings for Freebox OS's rest API
 test_files: []

data/lib/freebox_api/resources/redir.rb

@@ -1,27 +0,0 @@
-module FreeboxApi
-
-  module Resources
-
-    class Redir
-
-      attr_reader :id, :enabled, :ip_proto, :wan_port_start, :wan_port_end, :lan_ip, :lan_port, :hostname, :host, :comment
-
-      def initialize(id, enabled, ip_proto, wan_port_start, wan_port_end, lan_ip, lan_port, hostname, host, comment, freebox)
-        @id = id
-        @enabled = enabled
-        @ip_proto = ip_proto
-        @wan_port_start = wan_port_start
-        @wan_port_end = wan_port_end
-        @lan_ip = lan_ip
-        @lan_port = lan_port
-        @hostname = hostname
-        @host = host
-        @comment = comment
-        @freebox = freebox
-      end
-
-    end
-
-  end
-
-end