Add openssl

opencpu · Oct 25, 2014 · d7d97f7 · behrica · Oct 28, 2014 · d7d97f7
1 parent b084417
commit d7d97f7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -18,11 +18,12 @@ Imports:
     evaluate (>= 0.5.1),
     httpuv (>= 1.3),
     knitr (>= 1.4),
-    jsonlite (>= 0.9.12),
+    jsonlite (>= 0.9.13),
     devtools (>= 1.5),
     httr (>= 0.3),
     brew,
-    pander
+    pander,
+    openssl
 Suggests:
     RAppArmor,
     sendmailR,

diff --git a/NAMESPACE b/NAMESPACE
@@ -1,4 +1,4 @@
-# Generated by roxygen2 (4.0.1): do not edit by hand
+# Generated by roxygen2 (4.0.2): do not edit by hand
 
 S3method(print,opencpu)
 S3method(print,rhttpd)
@@ -21,4 +21,5 @@ importFrom(jsonlite,toJSON)
 importFrom(jsonlite,validate)
 importFrom(knitr,knit)
 importFrom(knitr,pandoc)
+importFrom(openssl,rand_bytes)
 importFrom(pander,pander)
diff --git a/R/session.R b/R/session.R
@@ -1,15 +1,17 @@
 #create the regex to identify session keys
+
 session_regex <- function(){
   paste0("^x[0-9a-f]{", config("key.length") + 1, "}$")
 }
 
+#' @importFrom openssl rand_bytes
 session <- local({
 
   #generates a random session hash
   generate <- function(){
     characters <- c(0:9, letters[1:6]);
     while(file.exists(sessiondir(
-      hash <- paste(c("x0", sample(characters, config("key.length"), replace=TRUE)), collapse="")
+      hash <- substring(paste(rand_bytes(config("key.length")), collapse=""), 1, config("key.length"))
     ))){}
     hash;
   }