Ability to conveniently patch the data (#108)

leonovk · Dec 3, 2024 · b2f7665 · b2f7665
1 parent 8fd04e4
commit b2f7665
Show file tree

Hide file tree

Showing 3 changed files with 196 additions and 1 deletion.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -13,3 +13,6 @@ RSpec/NestedGroups:
 
 RSpec/MultipleExpectations:
   Max: 2
+
+Metrics/ClassLength:
+  Max: 120
diff --git a/lib/wire_guard/server.rb b/lib/wire_guard/server.rb
@@ -56,7 +56,7 @@ def update_config(id, config_params)
 
       return nil if updated_config.nil?
 
-      json_config['configs'][id] = updated_config.merge(config_params)
+      json_config['configs'][id] = merge_config(updated_config, config_params)
 
       dump_json_config(json_config)
       dump_wireguard_config
@@ -136,5 +136,14 @@ def configs_empty?
     def build_new_config(configs, params)
       ClientConfigBuilder.new(configs, params).config
     end
+
+    def merge_config(updated_config, config_params)
+      config = updated_config.merge(config_params)
+      if !config_params['data'].nil? && config_params['data'].any?
+        config['data'] = updated_config['data'].merge(config_params['data'])
+      end
+
+      config
+    end
   end
 end
diff --git a/spec/lib/wire_guard/server_spec.rb b/spec/lib/wire_guard/server_spec.rb
@@ -428,5 +428,188 @@
         expect(WireGuard::ServerConfigUpdater).not_to have_received(:update)
       end
     end
+
+    context 'when the date contains data and the updated data does not match' do
+      let(:id) { '1' }
+      let(:config_params) do
+        {
+          'address' => '10.8.0.200',
+          'private_key' => 'a',
+          'public_key' => 'b',
+          'enable' => false,
+          'data' => {
+            'hah' => 'cheburek'
+          }
+        }
+      end
+      let(:expected_config) do
+        {
+          'id' => 1,
+          'address' => '10.8.0.200',
+          'private_key' => 'a',
+          'public_key' => 'b',
+          'preshared_key' => '3UzAMA6mLIGjHOImShNb5tWlkwxsha8LZZP7dm49meQ=',
+          'enable' => false,
+          'data' => {
+            'lol' => 'kek',
+            'hah' => 'cheburek'
+          }
+        }
+      end
+      let(:expected_result) do
+        {
+          'server' => {
+            'private_key' => '6Mlqg+1Umojm7a4VvgIi+YMp4oPrWNnZ5HLRFu4my2w=',
+            'public_key' => 'uygGKpQt7gOwrP+bqkiXytafHiM+XqFGc0jtZVJ5bnw=',
+            'address' => '10.8.0.1'
+          },
+          'configs' => {
+            'last_id' => 3,
+            'last_address' => '10.8.0.4',
+            '1' => {
+              'id' => 1,
+              'address' => '10.8.0.200',
+              'private_key' => 'a',
+              'public_key' => 'b',
+              'preshared_key' => '3UzAMA6mLIGjHOImShNb5tWlkwxsha8LZZP7dm49meQ=',
+              'enable' => false,
+              'data' => {
+                'lol' => 'kek',
+                'hah' => 'cheburek'
+              }
+            },
+            '2' => {
+              'id' => 2,
+              'address' => '10.8.0.3',
+              'private_key' => 'aN7ye98FKrmydwfA6tHgHE1PbiidWzUJ9cltnies8F4=',
+              'public_key' => 'hvIyIW2o8JROVKuY2yYFdUn0oA+43aLuT8KCy0YbORE=',
+              'preshared_key' => 'dVW/5kF8wnsx0zAwR4uPIa06btACxpQ/rHBL1B3qPnk=',
+              'enable' => false,
+              'data' => {
+                'cheburek' => 'hah'
+              }
+            },
+            '3' => {
+              'id' => 3,
+              'address' => '10.8.0.4',
+              'private_key' => 'eF3Owsqd5MGAIXjmALGBi8ea8mkFUmAiyh80U3hVXn8=',
+              'public_key' => 'bPKBg66uC1J2hlkE31Of5wnkg+IjowVXgoLcjcLn0js=',
+              'preshared_key' => 'IyVg7fktkSBxJ0uK82j6nlI7Vmo0E53eBmYZ723/45E=',
+              'enable' => true,
+              'data' => {
+                'key' => 'value'
+              }
+            }
+          }
+        }
+      end
+
+      it 'updates the config from the server' do
+        update_config
+
+        config = File.read(wg_conf_path)
+
+        expect(config).to eq(JSON.pretty_generate(expected_result))
+      end
+
+      it 'returns updated config' do
+        expect(update_config).to eq(expected_config)
+      end
+
+      it 'calls the configuration file update service WireGuard' do
+        update_config
+
+        expect(WireGuard::ServerConfigUpdater).to have_received(:update)
+      end
+    end
+
+    context 'when the date is not transmitted at all' do
+      let(:id) { '1' }
+      let(:config_params) do
+        {
+          'address' => '10.8.0.200',
+          'private_key' => 'a',
+          'public_key' => 'b',
+          'enable' => false
+        }
+      end
+      let(:expected_config) do
+        {
+          'id' => 1,
+          'address' => '10.8.0.200',
+          'private_key' => 'a',
+          'public_key' => 'b',
+          'preshared_key' => '3UzAMA6mLIGjHOImShNb5tWlkwxsha8LZZP7dm49meQ=',
+          'enable' => false,
+          'data' => {
+            'lol' => 'kek'
+          }
+        }
+      end
+      let(:expected_result) do
+        {
+          'server' => {
+            'private_key' => '6Mlqg+1Umojm7a4VvgIi+YMp4oPrWNnZ5HLRFu4my2w=',
+            'public_key' => 'uygGKpQt7gOwrP+bqkiXytafHiM+XqFGc0jtZVJ5bnw=',
+            'address' => '10.8.0.1'
+          },
+          'configs' => {
+            'last_id' => 3,
+            'last_address' => '10.8.0.4',
+            '1' => {
+              'id' => 1,
+              'address' => '10.8.0.200',
+              'private_key' => 'a',
+              'public_key' => 'b',
+              'preshared_key' => '3UzAMA6mLIGjHOImShNb5tWlkwxsha8LZZP7dm49meQ=',
+              'enable' => false,
+              'data' => {
+                'lol' => 'kek'
+              }
+            },
+            '2' => {
+              'id' => 2,
+              'address' => '10.8.0.3',
+              'private_key' => 'aN7ye98FKrmydwfA6tHgHE1PbiidWzUJ9cltnies8F4=',
+              'public_key' => 'hvIyIW2o8JROVKuY2yYFdUn0oA+43aLuT8KCy0YbORE=',
+              'preshared_key' => 'dVW/5kF8wnsx0zAwR4uPIa06btACxpQ/rHBL1B3qPnk=',
+              'enable' => false,
+              'data' => {
+                'cheburek' => 'hah'
+              }
+            },
+            '3' => {
+              'id' => 3,
+              'address' => '10.8.0.4',
+              'private_key' => 'eF3Owsqd5MGAIXjmALGBi8ea8mkFUmAiyh80U3hVXn8=',
+              'public_key' => 'bPKBg66uC1J2hlkE31Of5wnkg+IjowVXgoLcjcLn0js=',
+              'preshared_key' => 'IyVg7fktkSBxJ0uK82j6nlI7Vmo0E53eBmYZ723/45E=',
+              'enable' => true,
+              'data' => {
+                'key' => 'value'
+              }
+            }
+          }
+        }
+      end
+
+      it 'updates the config from the server' do
+        update_config
+
+        config = File.read(wg_conf_path)
+
+        expect(config).to eq(JSON.pretty_generate(expected_result))
+      end
+
+      it 'returns updated config' do
+        expect(update_config).to eq(expected_config)
+      end
+
+      it 'calls the configuration file update service WireGuard' do
+        update_config
+
+        expect(WireGuard::ServerConfigUpdater).to have_received(:update)
+      end
+    end
   end
 end