adamantite 0.0.3 → 0.0.6

data/lib/gui/form/password_object_form_window.rb

@@ -1,4 +1,6 @@
-require "base/editor/password_object_editor"
+# frozen_string_literal: true
+
+require 'base/editor/password_object_editor'
 
 module Adamantite
   module GUI
@@ -9,63 +11,63 @@ module Adamantite
         # This holds the final user produced by the form
         # And, a user can be optionally passed (e.g. `user_form(user: someuser)`) when editing an existing user
         option :password_object, default: nil
-        option :on_save, default: lambda { |password_object| }
-        option :master_pw
-        option :master_pw_salt
+        option :on_save, default: ->(password_object) {}
+        option :adamantite
 
         before_body do
-          @password_object_editor = Adamantite::Base::Editor::PasswordObjectEditor.new(master_pw, master_pw_salt, password_object)
+          @password_object_editor = Base::Editor::PasswordObjectEditor.new(adamantite, password_object)
         end
 
-        body {
-          window('Password Form', 50, 50) { |password_object_form_editor|
+        body do
+          window('Password Form', 50, 50) do |password_object_form_editor|
             margined true
 
-            vertical_box {
-              form {
-                entry {
+            vertical_box do
+              form do
+                entry do
                   label 'Website Title'
                   text <=> [@password_object_editor.editable_password_object, :website_title]
-                }
-                entry {
+                end
+                entry do
                   label 'Username'
                   text <=> [@password_object_editor.editable_password_object, :username]
-                }
+                end
 
-                password_entry {
+                password_entry do
                   label 'Password'
                   text <=> [@password_object_editor.editable_password_object, :password]
-                }
-                password_entry {
+                end
+                password_entry do
                   label 'Password Confirmation'
                   text <=> [@password_object_editor.editable_password_object, :password_confirmation]
-                }
-              }
-              horizontal_box {
+                end
+              end
+
+              horizontal_box do
                 stretchy false
 
-                button('Save') {
+                button('Save') do
                   on_clicked do
                     self.password_object = @password_object_editor.save
                     on_save.call(password_object)
                     password_object_form_editor.destroy
                   end
-                }
+                end
 
-                button('Cancel') {
+                button('Cancel') do
                   on_clicked do
                     @password_object_editor.cancel
                     password_object_form_editor.destroy
                   end
-                }
-              }
-            }
+                end
+              end
+            end
 
             on_closing do
               @password_object_editor.cancel
             end
-          }
-        }
+          end
+        end
       end
     end
   end

data/lib/gui/request/add_password_request.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 module Adamantite
   module GUI
     module Request
       class AddPasswordRequest
-
         attr_accessor :website_title, :username, :password, :password_confirmation, :password_saved
 
         def initialize(master_password, master_password_salt)
@@ -12,13 +13,13 @@ module Adamantite
         end
 
         def confirm_and_add_password!
-          if @password == @password_confirmation
-            @password_saved = true
-            pw_info_for_file = make_pw_info(@username, @password, @master_password, @master_password_salt)
-            write_pw_to_file(@website_title, **pw_info_for_file)
-          end
+          return unless @password == @password_confirmation
+
+          @password_saved = true
+          pw_info_for_file = make_pw_info(@username, @password, @master_password, @master_password_salt)
+          write_pw_to_file(@website_title, **pw_info_for_file)
         end
       end
     end
   end
-end
+end

data/lib/gui/request/login_request.rb

@@ -1,23 +1,20 @@
+# frozen_string_literal: true
+
+require 'base/adamantite'
+
 module Adamantite
   module GUI
     module Request
       class LoginRequest
 
-        attr_accessor :master_password, :master_password_salt, :authenticated
+        attr_accessor :adamantite, :master_password, :authenticated
 
         def authenticate!
-          user_master_pw_info = get_master_pw_info
-          master_pw_hash = user_master_pw_info['password']
-          master_pw_salt = user_master_pw_info['salt']
-          master_pw_comparator = generate_master_pw_comparator(master_pw_hash)
-
-          if master_pw_comparator == master_password + master_pw_salt
-            @authenticated = true
-            @master_password = master_password
-            @master_password_salt = master_pw_salt
-          end
+          @adamantite = Base::Adamantite.new(master_password)
+          @adamantite.authenticate!
+          @authenticated = @adamantite.authenticated?
         end
       end
     end
   end
-end
+end

data/lib/gui/request/set_master_password_request.rb

@@ -1,20 +1,19 @@
+# frozen_string_literal: true
+
+require 'base/adamantite'
+
 module Adamantite
   module GUI
     module Request
       class SetMasterPasswordRequest
-
         attr_accessor :new_master_pw, :new_master_pw_confirmation, :success
 
         def set_master_password!
           @success = false
-          if @new_master_pw == @new_master_pw_confirmation
-            master_pw_info = generate_master_pw_hash(@new_master_pw)
-            write_pw_to_file('master', password: master_pw_info[:master_pw_hash], salt: master_pw_info[:salt])
-            @success = true
-          end
-          @success
+          adamantite = Base::Adamantite.new(@new_master_pw)
+          @success = adamantite.serialize_master_password(@new_master_pw, @new_master_pw_confirmation)
         end
       end
     end
   end
-end
+end

data/lib/gui/request/update_master_password_request.rb

@@ -1,14 +1,15 @@
+# frozen_string_literal: true
+
 module Adamantite
   module GUI
     module Request
       class UpdateMasterPasswordRequest
+        attr_accessor :new_master_pw, :new_master_pw_confirmation, :adamantite
 
-        attr_accessor :new_master_pw, :new_master_pw_confirmation, :adamantite_object
-
-        def initialize(adamantite_object)
-          @adamantite_object = adamantite_object
+        def initialize(adamantite)
+          @adamantite = adamantite
         end
       end
     end
   end
-end
+end

data/lib/gui/screen/copy_screen.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Adamantite
   module GUI
     module Screen
@@ -6,13 +8,13 @@ module Adamantite
 
         option :password_title
 
-        body {
-          window('Adamantite - Copy Password', 400, 100) {
+        body do
+          window('Adamantite - Copy Password', 400, 100) do
             margined true
             label("Copied password for #{password_title} to your clipboard.")
-          }
-        }
+          end
+        end
       end
     end
   end
-end
+end

data/lib/gui/screen/login_screen.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module PWManager
   module GUI
@@ -7,19 +8,19 @@ module PWManager
 
         option :login_request
 
-        body {
-          window('Adamantite - Login', 400, 100) {
+        body do
+          window('Adamantite - Login', 400, 100) do
             margined true
 
-            vertical_box {
-              form {
-                password_entry {
+            vertical_box do
+              form do
+                password_entry do
                   label 'Master Password'
                   text <=> [login_request, :master_password]
-                }
-              }
+                end
+              end
 
-              button('Login') {
+              button('Login') do
                 on_clicked do
                   login_request.authenticate!
                   # Destroy window if password is correct.
@@ -28,11 +29,11 @@ module PWManager
                     ::LibUI.quit
                   end
                 end
-              }
-            }
-          }
-        }
+              end
+            end
+          end
+        end
       end
     end
   end
-end
+end

data/lib/gui/screen/set_master_password_screen.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Adamantite
   module GUI
     module Screen
@@ -6,21 +8,21 @@ module Adamantite
 
         option :set_master_password_request
 
-        body {
-          window('Adamantite - Create Master Password', 450, 150) {
+        body do
+          window('Adamantite - Create Master Password', 450, 150) do
             margined true
-            vertical_box {
-              form {
-                password_entry {
+            vertical_box do
+              form do
+                password_entry do
                   label 'Master Password'
                   text <=> [set_master_password_request, :new_master_pw]
-                }
-                password_entry {
+                end
+                password_entry do
                   label 'Master Password Confirmation'
                   text <=> [set_master_password_request, :new_master_pw_confirmation]
-                }
-              }
-              button('Set Master Password') {
+                end
+              end
+              button('Set Master Password') do
                 on_clicked do
                   set_master_password_request.set_master_password!
                   if set_master_password_request.success
@@ -31,11 +33,11 @@ module Adamantite
                     set_master_password_request.new_master_pw_confirmation = ''
                   end
                 end
-              }
-            }
-          }
-        }
+              end
+            end
+          end
+        end
       end
     end
   end
-end
+end

data/lib/gui/screen/show_screen.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Adamantite
   module GUI
     module Screen
@@ -6,14 +8,14 @@ module Adamantite
 
         option :password
 
-        body {
-          window('Adamantite - Show Password', 400, 100) {
+        body do
+          window('Adamantite - Show Password', 400, 100) do
             margined true
 
-            label("#{password}")
-          }
-        }
+            label(password.to_s)
+          end
+        end
       end
     end
   end
-end
+end

data/lib/gui/screen/update_master_password_screen.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Adamantite
   module GUI
     module Screen
@@ -6,26 +8,27 @@ module Adamantite
 
         option :update_master_password_request
 
-        body {
-          window('Adamantite - Update Master Password', 450, 150) {
+        body do
+          window('Adamantite - Update Master Password', 450, 150) do
             margined true
-            vertical_box {
-              form {
-                password_entry {
+            vertical_box do
+              form do
+                password_entry do
                   label 'New Master Password'
                   text <=> [update_master_password_request, :new_master_pw]
-                }
-                password_entry {
+                end
+                password_entry do
                   label 'New Master Password Confirmation'
                   text <=> [update_master_password_request, :new_master_pw_confirmation]
-                }
-              }
-              button('Update') {
+                end
+              end
+              button('Update') do
                 on_clicked do
                   new_master_pw = update_master_password_request.new_master_pw
                   new_master_pw_confirmation = update_master_password_request.new_master_pw_confirmation
-                  success = update_master_password_request.adamantite_object.update_master_password!(new_master_pw, new_master_pw_confirmation)
-                  if success
+                  pass = update_master_password_request.adamantite.update_master_password!(new_master_pw,
+                                                                                           new_master_pw_confirmation)
+                  if pass
                     body_root.destroy
                     ::LibUI.quit
                   else
@@ -33,10 +36,10 @@ module Adamantite
                     update_master_password_request.new_master_pw_confirmation = ''
                   end
                 end
-              }
-            }
-          }
-        }
+              end
+            end
+          end
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adamantite
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.6
 platform: ruby
 authors:
 - Jake Bruemmer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-11 00:00:00.000000000 Z
+date: 2023-11-24 00:00:00.000000000 Z
 dependencies: []
 description: A local password manager written in Ruby.
 email: jakebruemmer@gmail.com
@@ -19,11 +19,10 @@ extra_rdoc_files: []
 files:
 - bin/adamantite
 - lib/adamantite.rb
-- lib/adamantite_command_line.rb
 - lib/base/adamantite.rb
 - lib/base/editor/password_object_editor.rb
 - lib/base/password_object.rb
-- lib/file_utils/file_utils.rb
+- lib/file_utils/adamantite_file_utils.rb
 - lib/gui/form/password_object_form_window.rb
 - lib/gui/request/add_password_request.rb
 - lib/gui/request/login_request.rb
@@ -34,7 +33,6 @@ files:
 - lib/gui/screen/set_master_password_screen.rb
 - lib/gui/screen/show_screen.rb
 - lib/gui/screen/update_master_password_screen.rb
-- lib/pw_utils/pw_utils.rb
 homepage: https://github.com/jakebruemmer/adamantite
 licenses:
 - MIT
@@ -47,7 +45,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/adamantite_command_line.rb

@@ -1,95 +0,0 @@
-require "bcrypt"
-require "openssl"
-require "base64"
-require "json"
-require "io/console"
-
-require "file_utils/file_utils"
-require "pw_utils/pw_utils"
-
-include Adamantite::FileUtils
-include Adamantite::PWUtils
-
-puts "Welcome to Adamantite."
-
-if pw_file_exists?('master')
-  user_master_pw_info = get_master_pw_info
-  master_pw_hash = user_master_pw_info['password']
-  master_pw_salt = user_master_pw_info['salt']
-
-  master_pw = IO::console.getpass("Please enter your master password:")
-  master_pw_comparator = BCrypt::Password.new(master_pw_hash)
-
-  while master_pw_comparator != master_pw + master_pw_salt
-    puts "Entered password didn't match."
-    master_pw = IO::console.getpass("Please enter your master password:")
-    master_pw_hash = BCrypt::Password.create(master_pw + user_master_pw_info['salt'])
-  end
-
-  puts "Master password successfully entered."
-  puts "Here are your stored passwords:"
-  get_stored_pws.each_with_index do |pw, index|
-    puts "#{index + 1}. #{pw}"
-  end
-
-  puts "Would you like to enter another password? (Y/N)"
-  response = gets.chomp
-  while !["Y", "N"].include?(response)
-    puts "Please enter Y or N"
-  end
-
-  if response == "Y"
-    puts "What do you want to call this password?"
-    title = gets.chomp
-    puts "What is the username for #{title}?"
-    username = gets.chomp
-    pw = IO::console.getpass("Enter the password for this site.")
-    pw_confirmation = IO::console.getpass("Confirm the password for this site.")
-
-    while pw != pw_confirmation
-      puts "Those didn't match, please enter them again."
-      pw = IO::console.getpass("Enter the password for this site.")
-      pw_confirmation = IO::console.getpass("Confirm the password for this site.")
-    end
-
-    pw_info_for_file = make_pw_info(username, pw, master_pw, master_pw_salt)
-    write_pw_to_file(title, **pw_info_for_file)
-    puts "Successfully stored password for #{title}."
-
-  elsif response == "N"
-    puts "Exiting"
-  end
-
-  puts "Here are your stored passwords:"
-  stored_pws = get_stored_pws
-  stored_pws.each_with_index do |pw, index|
-    puts "#{index + 1}. #{pw}"
-  end
-
-  puts "Enter the number of the password that you would like to retrieve."
-  pw_entry = gets.chomp.to_i
-
-  pw_info = get_pw_file(stored_pws[pw_entry - 1])
-  stored_pw_selection = decrypt_pw(pw_info["iv"], pw_info['password'], master_pw, master_pw_salt)
-
-  IO.popen('pbcopy', 'w') { |f| f << stored_pw_selection }
-
-  puts "Your password has been copied to your clipboard."
-
-else
-  puts "You don't have a master password. Please enter one now."
-  master_pw = IO::console.getpass("Enter your master password:")
-  master_pw_confirmation = IO::console.getpass("Confirm your master password:")
-
-  while master_pw != master_pw_confirmation
-    puts "Those didn't match, please enter them again."
-    master_pw = IO::console.getpass("Enter your master password:")
-    master_pw_confirmation = IO::console.getpass("Confirm your master password:")
-  end
-
-  master_pw_info = generate_master_pw_hash(master_pw)
-
-  write_pw_to_file('master', password: master_pw_info[:master_pw_hash], salt: master_pw_info[:salt])
-
-  puts "Wrote master pw to file."
-end

data/lib/file_utils/file_utils.rb

@@ -1,55 +0,0 @@
-require "json"
-
-module Adamantite
-	module FileUtils
-		def home_dir
-			ENV['HOME']
-		end
-
-		def pwmanager_dir
-			File.join(home_dir, '.pwmanager')
-		end
-
-		def pwmanager_dir_exists?
-			Dir.exists?(pwmanager_dir)
-		end
-
-		def make_pwmanager_dir
-			Dir.mkdir(pwmanager_dir)
-		end
-
-		def pw_file(title)
-			File.join(pwmanager_dir, title)
-		end
-
-		def pw_file_exists?(title)
-			File.exists?(pw_file(title))
-		end
-
-		def write_pw_to_file(title, **kwargs)
-			if !pwmanager_dir_exists?
-				make_pwmanager_dir
-			end
-
-			File.open(pw_file(title), "w") do |f|
-				JSON.dump(kwargs, f)
-			end
-		end
-
-		def delete_pw_file(title)
-			File.delete(pw_file(title))
-		end
-
-		def get_pw_file(title)
-			JSON.load_file(pw_file(title))
-		end
-
-		def get_master_pw_info
-			get_pw_file('master')
-		end
-
-		def get_stored_pws
-			Dir.entries(pwmanager_dir).filter { |f| ![".", "..", "master"].include?(f) }
-		end
-	end
-end

data/lib/pw_utils/pw_utils.rb

@@ -1,40 +0,0 @@
-require "bcrypt"
-require "openssl"
-require "base64"
-
-module Adamantite
-  module PWUtils
-
-    def make_pw_info(username, pw, master_pw, master_pw_salt)
-      cipher = OpenSSL::Cipher::AES256.new(:CBC)
-      cipher.encrypt
-      iv = cipher.random_iv
-      cipher.key = Digest::MD5.hexdigest(master_pw + master_pw_salt)
-      cipher_text = cipher.update(pw) + cipher.final
-      utf8_cipher_text = Base64.encode64(cipher_text).encode('utf-8')
-      utf8_iv = Base64.encode64(iv).encode('utf-8')
-
-      {username: username, password: utf8_cipher_text, iv: utf8_iv}
-    end
-
-    def decrypt_pw(iv, pw_hash, master_pw, master_pw_salt)
-      decrypt_cipher = OpenSSL::Cipher::AES256.new(:CBC)
-      decrypt_cipher.decrypt
-      iv = Base64.decode64(iv.encode('ascii-8bit'))
-      decrypt_cipher.iv = iv
-      decrypt_cipher.key = Digest::MD5.hexdigest(master_pw + master_pw_salt)
-      decrypt_text = Base64.decode64(pw_hash.encode('ascii-8bit'))
-      decrypt_cipher.update(decrypt_text) + decrypt_cipher.final
-    end
-
-    def generate_master_pw_hash(master_pw)
-      salt = BCrypt::Engine.generate_salt
-      master_pw_hash = BCrypt::Password.create(master_pw + salt)
-      {'salt': salt, 'master_pw_hash': master_pw_hash}
-    end
-
-    def generate_master_pw_comparator(master_pw_hash)
-      BCrypt::Password.new(master_pw_hash)
-    end
-  end
-end