Skip to content

Saves the connection password in a sidecar ETS table. #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eloraburns wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Saves the connection password in a sidecar ETS table. #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8cd583
Saves the connection password in a sidecar process.
eloraburns Nov 16, 2018
789f9e4
Uses an ets table instead, as it has broader Elixir support (back to …
eloraburns Nov 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions lib/mariaex/password.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
defmodule Mariaex.Password do

@spec save!(String.t) :: :ets.tid()
def save!(password) do
tid = :ets.new(:password, [:private])
true = :ets.insert(tid, {:password, password})
tid
end

@spec get(:ets.tid()) :: String.t
def get(tid) do
[password: password] = :ets.lookup(tid, :password)
password
end
end
6 changes: 4 additions & 2 deletions lib/mariaex/protocol.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ defmodule Mariaex.Protocol do
alias Mariaex.Query
alias Mariaex.Cursor
alias Mariaex.Column
alias Mariaex.Password
import Mariaex.Messages
import Mariaex.ProtocolHelper

Expand Down Expand Up @@ -130,6 +131,7 @@ defmodule Mariaex.Protocol do
opts
|> Keyword.put_new(:username, System.get_env("MDBUSER") || System.get_env("USER"))
|> Keyword.put_new(:password, System.get_env("MDBPASSWORD"))
|> Keyword.update!(:password, &Password.save!/1)
|> Keyword.put_new(:hostname, System.get_env("MDBHOST") || "localhost")
|> Keyword.put_new(:port, System.get_env("MDBPORT") || 3306)
|> Keyword.put_new(:timeout, @timeout)
Expand Down Expand Up @@ -206,7 +208,7 @@ defmodule Mariaex.Protocol do
<<flag :: size(32)>> = <<flag2 :: size(16), flag1 :: size(16)>>
deprecated_eof = (flag &&& @client_deprecate_eof) == @client_deprecate_eof
handshake(auth_plugin_data1: salt1, auth_plugin_data2: salt2) = handshake
scramble = case password = opts[:password] do
scramble = case password = Password.get(opts[:password]) do
nil -> ""
"" -> ""
_ -> password(plugin, password, <<salt1 :: binary, salt2 :: binary>>)
Expand Down Expand Up @@ -1077,7 +1079,7 @@ defmodule Mariaex.Protocol do

def dispatch(packet(msg: :mysql_old_password), state = %{opts: opts, handshake: handshake}) do
if opts[:insecure_auth] do
password = opts[:password]
password = Password.get(opts[:password])
%{salt: {salt1, salt2}, seqnum: seqnum} = handshake
password = password(@mysql_old_password, password, <<salt1 :: binary, salt2 :: binary>>)
# TODO: rethink seqnum handling
Expand Down