diff options
author | Azul <azul@leap.se> | 2012-06-28 19:43:40 +0200 |
---|---|---|
committer | Azul <azul@leap.se> | 2012-06-29 14:55:10 +0200 |
commit | 20bf14939fbd75e3ee0206c2bf14737e2c7ac2c2 (patch) | |
tree | e035c91c65e8e48d6a6af317e900a8fb9897a739 /example/views | |
parent | e55ff681bcc5a6c479530d1411a3da75912d78e5 (diff) |
adopted srp algo to srp-js way of doing things.
all large integers are now send as hex strings.
Using sha256_str all over the place.
This finally gives me successful logins. Needs a log of cleanup never the less.
Diffstat (limited to 'example/views')
-rw-r--r-- | example/views/authenticate.erb | 2 | ||||
-rw-r--r-- | example/views/handshake.erb | 2 | ||||
-rw-r--r-- | example/views/index.erb | 10 | ||||
-rw-r--r-- | example/views/layout.erb | 12 | ||||
-rw-r--r-- | example/views/ok.erb | 2 | ||||
-rw-r--r-- | example/views/salt.erb | 2 | ||||
-rw-r--r-- | example/views/xml.erb | 2 |
7 files changed, 23 insertions, 9 deletions
diff --git a/example/views/authenticate.erb b/example/views/authenticate.erb index 7d6e39f..a6bf80d 100644 --- a/example/views/authenticate.erb +++ b/example/views/authenticate.erb @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <% if @auth[:M2] %> - <M><%=@auth[:M2]%></M> + <M><%="%x" % [@auth[:M2]]%></M> <% end %> <% if @auth[:error] %> <error><%=@auth[:error]%></error> diff --git a/example/views/handshake.erb b/example/views/handshake.erb index 66fac73..49eca91 100644 --- a/example/views/handshake.erb +++ b/example/views/handshake.erb @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?> -<r s="<%=@user.salt%>" B="<%=@auth[:B]%>" /> +<%= %Q(<r s="%x" B="%x" />) % [@user.salt, @auth[:B]] %> diff --git a/example/views/index.erb b/example/views/index.erb index 48d9f71..24d2501 100644 --- a/example/views/index.erb +++ b/example/views/index.erb @@ -21,12 +21,12 @@ </div> <div class="row-fluid"> <div class="span4"> - <% if @user.login %> + <% if @user %> <h4> You are signed up as <%= @user.login %>. </h4> <% end %> </div> <div class="span4"> - <% if @user.active %> + <% if @user && @user.active %> <h4> You are logged in.</h4> <% end %> </div> @@ -35,13 +35,13 @@ </div> <div class="row-fluid"> <div class="span4"> - <%= button_link(:signup, :primary => !@user.login) %> + <%= button_link(:signup, :primary => !@user) %> </div> <div class="span4"> - <%= button_link(:login, :primary => @user.login && !@user.active) %> + <%= button_link(:login, :primary => @user && !@user.active) %> </div> <div class="span4"> - <%= button_link(:verify, :primary => @user.active) %> + <%= button_link(:verify, :primary => @user && @user.active) %> </div> </div> diff --git a/example/views/layout.erb b/example/views/layout.erb index f4eae0a..fc0eaf1 100644 --- a/example/views/layout.erb +++ b/example/views/layout.erb @@ -22,8 +22,16 @@ <%= yield %> <script type="text/javascript" src="jquery.min.js"> </script> - <script type="text/javascript" src="srp.min.js"> </script> - <script type="text/javascript" src="srp_register.min.js"> </script> +<!-- <script type="text/javascript" src="srp.min.js"> </script> +<script type="text/javascript" src="srp_register.min.js"> </script> --> + + <script type="text/javascript" src="srp-source/SHA256.js"> </script> + <script type="text/javascript" src="srp-source/prng4.js"> </script> + <script type="text/javascript" src="srp-source/rng.js"> </script> + <script type="text/javascript" src="srp-source/jsbn.js"> </script> + <script type="text/javascript" src="srp-source/jsbn2.js"> </script> + <script type="text/javascript" src="srp-source/srp.js"> </script> + <script type="text/javascript" src="srp-source/srp_register.js"> </script> <script type="text/javascript" src="srp.js"> </script> </body> diff --git a/example/views/ok.erb b/example/views/ok.erb new file mode 100644 index 0000000..b0d4f93 --- /dev/null +++ b/example/views/ok.erb @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ok/> diff --git a/example/views/salt.erb b/example/views/salt.erb new file mode 100644 index 0000000..5b34b93 --- /dev/null +++ b/example/views/salt.erb @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<salt><%="%x" % @user.salt %></salt> diff --git a/example/views/xml.erb b/example/views/xml.erb new file mode 100644 index 0000000..0e2dcc2 --- /dev/null +++ b/example/views/xml.erb @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<%= yield %> |