Home Explore Help
Register Sign In
Ethosa
/
Akane
mirror of https://github.com/Ethosa/akane
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

v0.0.6, passwords hashing added.

Ethosa 5 years ago
parent
64a1b41187
commit
8bb5569f14
5 changed files with 85 additions and 9 deletions
Split View Show Diff Stats
  1. 3 1
      README.md
  2. 1 1
      akane.nimble
  3. 55 7
      akane/akane.nim
  4. 25 0
      tests/test5/main.nim
  5. 1 0
      tests/test5/nim.cfg

+ 3 - 1
README.md
View File 

@@ -5,7 +5,7 @@
 
 [![Nim language-plastic](https://github.com/Ethosa/yukiko/blob/master/nim-lang.svg)](https://github.com/Ethosa/yukiko/blob/master/nim-lang.svg)

 [![License](https://img.shields.io/github/license/Ethosa/akane)](https://github.com/Ethosa/akane/blob/master/LICENSE)

 

-<h4>Latest version - 0.0.5</h4>

+<h4>Latest version - 0.0.6</h4>

 <h4>Stable version - ?</h4>

 </div>

 

@@ -19,6 +19,7 @@
 
 -   `templates` folder.

 -   Only the standard library used.

 -   Debug mode.

+-   Password hashing.

 -   Simple usage

     ```nim

     import akane

@@ -28,6 +29,7 @@
 
 

       server.pages:

         equals("/"):  # when url is "http://...localhost:5000/"

+          # You also can write "/" instead of equals("/")

           # type of `request` is a Request.

           await request.answer("Hello, world!")  # utf-8 encoded message.

+ 1 - 1
akane.nimble
View File 

@@ -1,7 +1,7 @@
 
 [Package]

 name = "akane"

 author = "Ethosa"

-version = "0.0.5"

+version = "0.0.6"

 description = "The Nim asynchronous web framework."

 license = "MIT"

 srcDir = "akane"

+ 55 - 7
akane/akane.nim
View File 

@@ -11,6 +11,7 @@ import macros
 
 import times

 import json  # urlParams

 import uri  # decodeUrl

+import std/sha1  # sha1 passwords.

 import os

 import re  # regex

 

@@ -146,6 +147,23 @@ proc parseQuery*(request: Request): Future[JsonNode] {.async.} =
 
       " to url \"", decodeUrl(request.url.path), "\".")

 

 

+proc password2hash*(password: string): Future[string] {.async, inline.} =

+  ## Generates a sha1 from `password`.

+  ##

+  ## Arguments:

+  ## -   ``password`` - user password.

+  return $secureHash(password)

+

+

+proc validatePassword*(password, hashpassword: string): Future[bool] {.async, inline.} =

+  ## Validates the password and returns true, if the password is valid.

+  ##

+  ## Arguments:

+  ## -   ``password`` - got password from user input.

+  ## -   ``hashpassword`` - response from `password2hash proc <#password2hash,string>`_

+  return secureHash(password) == parseSecureHash(hashpassword)

+

+

 macro pages*(server: ServerRef, body: untyped): untyped =

   ## This macro provides convenient page adding.

   ##

@@ -157,6 +175,11 @@ macro pages*(server: ServerRef, body: untyped): untyped =
 
   ## -   ``regex``

   ## -   ``notfound`` - this page uses without URL argument.

   ##

+  ## You can also not write `equals("/")`:

+  ##   server.pages:

+  ##     "/helloworld":

+  ##       ...

+  ##

   ## ..code-block::Nim

   ##  server.pages:

   ##    equals("/home"):

@@ -200,10 +223,10 @@ macro pages*(server: ServerRef, body: untyped): untyped =
 
 

   for i in body:  # for each page in statment list.

     let

-      current = $i[0]

-      path = if i.len == 3: i[1] else: newEmptyNode()

+      current = if i.len == 3: $i[0] else: "equals"

+      path = if i.len == 3: i[1] else: i[0]

       slist = if i.len == 3: i[2] else: i[1]

-    if (i.kind == nnkCall and i[0].kind == nnkIdent and

+    if (i.kind == nnkCall and

         (path.kind == nnkStrLit or path.kind == nnkCallStrLit or path.kind == nnkEmpty) and

         slist.kind == nnkStmtList):

       if current == "equals":

@@ -216,7 +239,7 @@ macro pages*(server: ServerRef, body: untyped): untyped =
 
               )

             )

           )

-        ifstmtlist.add(  # request.path.url == i[1]

+        ifstmtlist.add(  # decoded_url == `path`

           newNimNode(nnkElifBranch).add(

             newCall("==", path, ident("decoded_url")),

             slist))

@@ -331,7 +354,7 @@ macro answer*(request, message: untyped, http_code = Http200): untyped =
 
   ## Responds from server with utf-8.

   ##

   ## Translates to:

-  ##   await request.respond(Http200, "<head><meta charset='utf-8'></head>" & message)

+  ##   request.respond(Http200, "<head><meta charset='utf-8'></head>" & message)

   result = newCall(

     "respond",

     request,

@@ -344,7 +367,7 @@ macro error*(request, message: untyped, http_code = Http404): untyped =
 
   ## Responds from server with utf-8.

   ##

   ## Translates to:

-  ##   await request.respond(Http404, "<head><meta charset='utf-8'></head>" & message)

+  ##   request.respond(Http404, "<head><meta charset='utf-8'></head>" & message)

   result = newCall(

     "respond",

     request,

@@ -353,9 +376,34 @@ macro error*(request, message: untyped, http_code = Http404): untyped =
 
   )

 

 

+macro sendJson*(request, message: untyped, http_code = Http200): untyped =

+  ## Sends JsonNode with "Content-Type": "application/json" in headers.

+  ##

+  ## Translates to:

+  ##   request.respond(

+  ##     Http200,

+  ##     $message,

+  ##     newHttpHeaders([("Content-Type","application/json")]))

+  result = newCall(

+    "respond",

+    request,

+    http_code,

+    newCall("$", message),

+    newCall(

+      "newHttpHeaders",

+      newNimNode(nnkBracket).add(

+        newNimNode(nnkPar).add(

+          newLit("Content-Type"),

+          newLit("application/json")

+        )

+      )

+    )

+  )

+

+

 macro start*(server: ServerRef): untyped =

   ## Starts server.

   result = quote do:

     if AKANE_DEBUG_MODE:

       echo "Server starts on http://", `server`.address, ":", `server`.port

-    waitFor `server`.server.serve(Port(`server`.port), receivepages)

+    waitFor `server`.server.serve(Port(`server`.port), receivepages, `server`.address)

+ 25 - 0
tests/test5/main.nim
View File 

@@ -0,0 +1,25 @@
 
+# author: Ethosa
 
+# password shashing.
 
+import akane
 
+
 
+
 
+proc main {.async.} =  # main proc for gcsafe
 
+  var
 
+    server = newServer(debug=true)
 
+    hashpassword = await password2hash("Hello world")
 
+
 
+  server.pages:
 
+    "/login":  # try "domain/login?password=Hello%20World"
 
+      if urlParams.hasKey("password"):
 
+        if await validatePassword(urlParams["password"].getStr, hashpassword):
 
+          await request.sendJson(%*{"response": %true})
 
+        else:
 
+          await request.sendJson(%*{"error": %"password is not correct."})
 
+      else:
 
+        await request.sendJson(%*{"error": %"password param not found."})
 
+    notfound:
 
+      await request.error("<h1 align='center'>Sorry, but page not found :(</h1>")
 
+
 
+  server.start()  # Starts server.
 
+
 
+waitFor main()

+ 1 - 0
tests/test5/nim.cfg
View File 

@@ -0,0 +1 @@
 
+--path:"../../akane"