pi_build_modifier 0.1.4.pre.alpha → 0.2.0.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7959456c61cee37a94e4ac44e5bc09ffc8920aa2
-  data.tar.gz: f8d6630ddbbcf9009b07f1034558e1acaee3a52c
+  metadata.gz: 2166dffe358e62ffec35a50e83528f06ac2c543b
+  data.tar.gz: 737ac930c588b69ab8baf430837022370274db13
 SHA512:
-  metadata.gz: 47be6299a1afafd6ecf032129bb161bdaf3b070b74a0137f40f83b92bff537da9bd2ba3a969262d4583f10cd1fb0e7cf17f2a1afb8565abacea6f23f4494e956
-  data.tar.gz: '088072bcc25419d962fc76db7c54e3e305aa7bd544c228c12281d1b8513fda34fb2a734ae036ca20b7d24a3c61ca00a1e46b88c50f35a2a9792c87679de5b0c3'
+  metadata.gz: 055c01e36cdb9ae6473cd5598567470d034541115f1a8ed8be207fa7ef284cfaabcefbeff7e2fd639adccf1af5a640a6cc45c802a4d57cd68d32fbecc4b2527d
+  data.tar.gz: 4705763b3e1c33c7b0397a088316c59f99e48933628b99f4bc18b354b9d342522da96e75beea63cae959bfbde93a78063579691d56429f106bd3e0b3d80b6163

data/lib/pi_build_modifier.rb

@@ -23,17 +23,23 @@ require 'pi_build_modifier/net-tweaks/wifi_network'
 require 'pi_build_modifier/modifier/erb_mapper'
 require 'pi_build_modifier/version'
 require 'pi_build_modifier/modifier_task'
+require 'pi_build_modifier/config/logex'
 
 module PiBuildModifier
+
+  ##
+  # PiBuildModifier implements all cli commands of pi_build_modifier.
+
   class PiBuildModifier < Thor
 
-    desc 'modify CONFIG WORKSPACE', 'Modify the pi image sources at the specified WORKSPACE with the specified configuration file.'
+    desc 'modify CONFIG WORKSPACE', 'Modify the pi image sources at the specified WORKSPACE with the specified configuration file CONFIG.'
     def modify(config, workspace)
+      $logger.debug "modify #{config} #{workspace}"
       task = Task::Modifier.new(config, workspace)
       task.execute
     end
 
-    desc 'version', 'Show the version of the modifier.'
+    desc 'v, version', 'Show the version of the modifier.'
     def version
       puts VERSION
     end

data/lib/pi_build_modifier/boot-files/boot.rb

@@ -0,0 +1,64 @@
+# Copyright (c) 2017 Beate Ottenwälder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'erb'
+require 'json'
+
+module PiBuildModifier
+
+  ##
+  # The Locale class is used to customize the locales
+
+  class Boot
+
+    C_GROUPS = 'cgroups'
+
+    C_GROUP_MEMORY = 'memory'
+
+    attr_accessor :c_groups
+
+    attr_reader :template_path, :relative_output_path
+
+    def initialize(c_groups = [''])
+      @c_groups = c_groups
+      @template_path = File.join(File.dirname(__FILE__), '/templates/07-resize-init.diff.erb').to_s
+      @relative_output_path = 'stage2/01-sys-tweaks/00-patches/07-resize-init.diff'
+    end
+
+    def mapper(workspace)
+      ERBMapper.new(self,workspace)
+    end
+
+    def map(json_data)
+      unless json_data.nil? || !json_data.has_key?(C_GROUPS)
+        if json_data[C_GROUPS].has_key?(C_GROUP_MEMORY) && json_data[C_GROUPS][C_GROUP_MEMORY]
+          @c_groups << 'cgroup_memory=1'
+        end
+      end
+    end
+
+    def get_binding
+      binding
+    end
+
+  end
+
+end
+

data/lib/pi_build_modifier/boot-files/templates/07-resize-init.diff.erb

@@ -0,0 +1,5 @@
+--- a/rootfs/boot/cmdline.txt
++++ b/rootfs/boot/cmdline.txt
+@@ -1 +1 @@
+-dwc_otg.lpm_enable=0 console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait
++dwc_otg.lpm_enable=0 console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 <%= @c_groups.join(' ') %> elevator=deadline fsck.repair=yes rootwait quiet init=/usr/lib/raspi-config/init_resize.sh

data/lib/pi_build_modifier/config/logex.rb

@@ -0,0 +1,25 @@
+# Copyright (c) 2017 Beate Ottenwälder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'logger'
+
+module PiBuildModifier
+  $logger = Logger.new(STDOUT)
+end

data/lib/pi_build_modifier/locale/locale_debconf.rb

@@ -22,6 +22,10 @@ require 'erb'
 require 'json'
 
 module PiBuildModifier
+
+  ##
+  # The Locale class is used to customize the locales
+
   class Locale
 
     LOCALE = 'locale'
@@ -41,9 +45,13 @@ module PiBuildModifier
       @relative_output_path = 'stage0/01-locale/00-debconf'
     end
 
+    def mapper(workspace)
+      ERBMapper.new(self,workspace)
+    end
+
     def map(json_data)
       unless json_data.nil?
-        @gen_locales = json_data[LOCALE][GEN].map {|rd| rd} if json_data.has_key?(LOCALE) && json_data[LOCALE].has_key?(GEN)
+        @gen_locales = json_data[LOCALE][GEN].map {|gen| gen} if json_data.has_key?(LOCALE) && json_data[LOCALE].has_key?(GEN)
         @sys_locale = json_data[LOCALE][SYS] if json_data.has_key?(LOCALE) && json_data[LOCALE].has_key?(SYS)
       end
     end

data/lib/pi_build_modifier/modifier/mapper.rb

@@ -37,7 +37,7 @@ module PiBuildModifier
     end
 
     def modify
-      @data.map unless @data.nil?
+      @data.modify unless @data.nil?
     end
 
   end

data/lib/pi_build_modifier/modifier/pi_modifier.rb

@@ -45,8 +45,8 @@ module PiBuildModifier
 
     def modify
       load_config
-      map
-      modify_mapper
+      map_all
+      modify_all
     end
 
     private def load_config
@@ -59,13 +59,13 @@ module PiBuildModifier
       end
     end
 
-    private def map
+    private def map_all
       @mappers.each do |c|
         c.map(@json_data)
       end
     end
 
-    private def modify_mapper
+    private def modify_all
       @mappers.each do |c|
         c.modify
       end

data/lib/pi_build_modifier/modifier_task.rb

@@ -24,6 +24,8 @@ require 'pi_build_modifier/net-tweaks/wifi_network'
 require 'pi_build_modifier/system/system_type'
 require 'pi_build_modifier/sys_tweaks/run_modifier'
 require 'pi_build_modifier/sys_tweaks/ssh'
+require 'pi_build_modifier/locale/locale_debconf'
+require 'pi_build_modifier/boot-files/boot'
 
 module PiBuildModifier
   module Task
@@ -32,13 +34,28 @@ module PiBuildModifier
       attr_reader :pi_modifier
 
       def initialize(config, workspace, pi_modifier = PiModifier.new)
+        @mappers = create_mappers
+        @mappers[:run_modifier].append(@mappers[:ssh]) #TODO: This connection has to be established somewhere else
         @pi_modifier = pi_modifier
-        @pi_modifier.with_json_configuration(config)
+        configure_pi_modifier(config, workspace)
+      end
 
-        @pi_modifier.with_mapper(ERBMapper.new(WPASupplicant.new, workspace))
-        @pi_modifier.with_mapper(System.new.mapper(workspace))
-        @pi_modifier.with_mapper(Ssh.new.mapper(workspace))
-        @pi_modifier.with_mapper(RunModifier.new.mapper(workspace))
+      private def create_mappers
+        {
+            :wpa_supplicant => WPASupplicant.new,
+            :system => System.new,
+            :ssh => Ssh.new,
+            :run_modifier => RunModifier.new,
+            :locale => Locale.new,
+            :boot => Boot.new
+        }
+      end
+
+      private def configure_pi_modifier(config, workspace)
+        @pi_modifier.with_json_configuration(config)
+        @mappers.each do |*, mapper_data|
+          @pi_modifier.with_mapper(mapper_data.mapper(workspace))
+        end
       end
 
       def execute

data/lib/pi_build_modifier/net-tweaks/wifi_network.rb

@@ -20,15 +20,19 @@
 
 require 'erb'
 require 'json'
+require 'openssl'
+require 'pi_build_modifier/modifier/erb_mapper'
 
 module PiBuildModifier
-  class WifiNetwork
 
-    attr_accessor :ssid, :psk, :template
+  ##
+  # WifiNetwork represents a network in the wpa_supplicant configuration
+
+  class WifiNetwork
 
-    attr_reader :file
+    attr_reader :ssid, :psk
 
-    def initialize(ssid = 'no_ssid', psk = 'no_psk')
+    def initialize(ssid, psk)
       @ssid = ssid
       @psk = psk
     end
@@ -36,29 +40,65 @@ module PiBuildModifier
     def to_s
       sprintf('{
   ssid="%s"
-  psk="%s"
+  psk=%s
 }', ssid, psk)
     end
   end
 
+  ##
+  # WPASupplicant represents the wpa_supplicant's configuration
+
   class WPASupplicant
 
+    PASSKEY = 'passphrase'
+
+    WPA_PASSKEY = 'wpa_passphrase'
+
+    SSID = 'ssid'
+
     attr_reader :template_path, :relative_output_path
 
-    def initialize(networks = Array.new(0), wpa_country = 'DE')
-      @networks = networks
-      @wpa_country = wpa_country
+    def initialize
+      @networks = map_network(nil)
+      @wpa_country = 'DE'
       @template_path = File.join(File.dirname(__FILE__), '/templates/wpa_supplicant.conf.erb').to_s
       @relative_output_path = 'stage2/02-net-tweaks/files/wpa_supplicant.conf'
     end
 
+    def mapper(workspace)
+      ERBMapper.new(self, workspace)
+    end
+
     def map(json_data)
       unless json_data.nil?
-        @networks = json_data['wifi']['networks'].map {|rd| WifiNetwork.new(rd['ssid'], rd['wpsk'])} if json_data.has_key?('wifi') && json_data['wifi'].has_key?('networks')
+        @networks = map_network(json_data['wifi']) if json_data.has_key?('wifi')
         @wpa_country = json_data['wifi']['wpa_country'] if json_data.has_key?('wifi') && json_data['wifi'].has_key?('wpa_country')
       end
     end
 
+    private def map_network(json_data)
+      if json_data.nil?
+        networks = Array.new(0)
+      else
+        networks = json_data['networks'].map do |rd|
+          ssid = if rd.has_key?(SSID)
+                   rd[SSID]
+                 else
+                   'no_ssid'
+                 end
+          psk = if rd.has_key?(PASSKEY)
+                  OpenSSL::PKCS5.pbkdf2_hmac_sha1(rd[PASSKEY], ssid, 4096, 32).unpack("H*").first
+                elsif rd.has_key?(WPA_PASSKEY)
+                  rd[WPA_PASSKEY]
+                else
+                  'no_psk'
+                end
+          WifiNetwork.new(ssid, psk)
+        end
+      end
+      networks
+    end
+
     def get_binding
       binding
     end

data/lib/pi_build_modifier/sys_tweaks/run_modifier.rb

@@ -46,9 +46,6 @@ module PiBuildModifier
       @appender << appender
     end
 
-    def map(json_data)
-    end
-
     def modify
       open("#{@workspace}/#{@relative_output_path}", 'a') do |f|
         f.puts ''

data/lib/pi_build_modifier/sys_tweaks/ssh.rb

@@ -21,6 +21,7 @@
 require 'fileutils'
 require 'pi_build_modifier/modifier/mapper'
 require 'pi_build_modifier/sys_tweaks/run_modifier'
+require 'pi_build_modifier/config/logex'
 
 module PiBuildModifier
 
@@ -48,7 +49,7 @@ module PiBuildModifier
       unless json_data.nil?
         @enable = 'disable' if json_data.has_key?('ssh') && json_data['ssh'].has_key?('enabled') && (not json_data['ssh']['enabled'])
       else
-        # TODO: log error
+        $logger.error 'Invalid json data.'
       end
     end
 

data/lib/pi_build_modifier/version.rb

@@ -19,5 +19,5 @@
 # SOFTWARE.
 
 module PiBuildModifier
-  VERSION = '0.1.4-alpha'
+  VERSION = '0.2.0-alpha'
 end

data/pi_build_modifier.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.executables = spec.files.grep(%r{^bin/}) {|f| File.basename(f)}
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.15'
@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rdoc', '~> 5.1'
   spec.add_runtime_dependency 'thor', '~> 0.20'
   spec.add_runtime_dependency 'json', '~> 2.1'
+  spec.add_runtime_dependency 'openssl', '~> 2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pi_build_modifier
 version: !ruby/object:Gem::Version
-  version: 0.1.4.pre.alpha
+  version: 0.2.0.pre.alpha
 platform: ruby
 authors:
 - Beate Ottenwälder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-14 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: openssl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: Modifies the build process of a Raspbian image.
 email: ottenwbe.public@gmail.com
 executables:
@@ -124,6 +138,9 @@ files:
 - Rakefile
 - bin/pi_build_modifier
 - lib/pi_build_modifier.rb
+- lib/pi_build_modifier/boot-files/boot.rb
+- lib/pi_build_modifier/boot-files/templates/07-resize-init.diff.erb
+- lib/pi_build_modifier/config/logex.rb
 - lib/pi_build_modifier/locale/locale_debconf.rb
 - lib/pi_build_modifier/locale/templates/00-debconf.erb
 - lib/pi_build_modifier/modifier/erb_mapper.rb