Skip to content
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

Add hmac functions #35

Merged
merged 2 commits into from
Mar 30, 2018
Merged

Add hmac functions #35

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
16af73e
Add hmac functions
kpcyrd Mar 30, 2018
cb7bbec
Improve error handling
kpcyrd Mar 30, 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
28 changes: 28 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ md-5 = "0.7"
sha-1 = "0.7"
sha2 = "0.7"
sha3 = "0.7"
digest = "0.7"
hmac = "0.5"
base64 = "0.9"

reqwest = "0.8"
Expand Down
6 changes: 6 additions & 0 deletions src/ctx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,12 @@ impl Script {
runtime::base64_encode(&mut lua, state.clone());
runtime::execve(&mut lua, state.clone());
runtime::hex(&mut lua, state.clone());
runtime::hmac_md5(&mut lua, state.clone());
runtime::hmac_sha1(&mut lua, state.clone());
runtime::hmac_sha2_256(&mut lua, state.clone());
runtime::hmac_sha2_512(&mut lua, state.clone());
runtime::hmac_sha3_256(&mut lua, state.clone());
runtime::hmac_sha3_512(&mut lua, state.clone());
runtime::html_select(&mut lua, state.clone());
runtime::html_select_list(&mut lua, state.clone());
runtime::http_basic_auth(&mut lua, state.clone()); // TODO: deprecate?
Expand Down
2 changes: 2 additions & 0 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ extern crate md5;
extern crate sha1;
extern crate sha2;
extern crate sha3;
extern crate digest;
extern crate hmac;
extern crate base64;

#[cfg(not(windows))]
Expand Down
150 changes: 93 additions & 57 deletions src/runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ use md5;
use sha1;
use sha2;
use sha3::{self, Digest};
use digest::{Input, BlockInput, FixedOutput};
use digest::generic_array::ArrayLength;
use hmac::{Hmac, Mac};
use base64;

use reqwest;
Expand Down Expand Up @@ -115,21 +118,78 @@ pub fn hex(lua: &mut hlua::Lua, state: State) {
}))
}

fn hmac<D>(secret: AnyLuaValue, msg: AnyLuaValue) -> Result<AnyLuaValue>
where
D: Input + BlockInput + FixedOutput + Default,
D::BlockSize: ArrayLength<u8>,
{
let secret = byte_array(secret)?;
let msg = byte_array(msg)?;

let mut mac = match Hmac::<D>::new(&secret){
Ok(mac) => mac,
Err(_) => return Err("invalid key length".into()),
};
mac.input(&msg);
let result = mac.result();
Ok(lua_bytes(&result.code()))
}

pub fn hmac_md5(lua: &mut hlua::Lua, state: State) {
lua.set("hmac_md5", hlua::function2(move |secret: AnyLuaValue, msg: AnyLuaValue| -> Result<AnyLuaValue> {
hmac::<md5::Md5>(secret, msg)
.map_err(|err| state.set_error(err))
}))
}

pub fn hmac_sha1(lua: &mut hlua::Lua, state: State) {
lua.set("hmac_sha1", hlua::function2(move |secret: AnyLuaValue, msg: AnyLuaValue| -> Result<AnyLuaValue> {
hmac::<sha1::Sha1>(secret, msg)
.map_err(|err| state.set_error(err))
}))
}

pub fn hmac_sha2_256(lua: &mut hlua::Lua, state: State) {
lua.set("hmac_sha2_256", hlua::function2(move |secret: AnyLuaValue, msg: AnyLuaValue| -> Result<AnyLuaValue> {
hmac::<sha2::Sha256>(secret, msg)
.map_err(|err| state.set_error(err))
}))
}

pub fn hmac_sha2_512(lua: &mut hlua::Lua, state: State) {
lua.set("hmac_sha2_512", hlua::function2(move |secret: AnyLuaValue, msg: AnyLuaValue| -> Result<AnyLuaValue> {
hmac::<sha2::Sha512>(secret, msg)
.map_err(|err| state.set_error(err))
}))
}

pub fn hmac_sha3_256(lua: &mut hlua::Lua, state: State) {
lua.set("hmac_sha3_256", hlua::function2(move |secret: AnyLuaValue, msg: AnyLuaValue| -> Result<AnyLuaValue> {
hmac::<sha3::Sha3_256>(secret, msg)
.map_err(|err| state.set_error(err))
}))
}

pub fn hmac_sha3_512(lua: &mut hlua::Lua, state: State) {
lua.set("hmac_sha3_512", hlua::function2(move |secret: AnyLuaValue, msg: AnyLuaValue| -> Result<AnyLuaValue> {
hmac::<sha3::Sha3_512>(secret, msg)
.map_err(|err| state.set_error(err))
}))
}

pub fn html_select(lua: &mut hlua::Lua, state: State) {
lua.set("html_select", hlua::function2(move |html: String, selector: String| -> Result<AnyLuaValue> {
match html::html_select(&html, &selector) {
Ok(x) => Ok(x.into()),
Err(err) => Err(state.set_error(err)),
}
html::html_select(&html, &selector)
.map(|x| x.into())
.map_err(|err| state.set_error(err))
}))
}

pub fn html_select_list(lua: &mut hlua::Lua, state: State) {
lua.set("html_select_list", hlua::function2(move |html: String, selector: String| -> Result<Vec<AnyLuaValue>> {
match html::html_select_list(&html, &selector) {
Ok(x) => Ok(x.into_iter().map(|x| x.into()).collect()),
Err(err) => Err(state.set_error(err)),
}
html::html_select_list(&html, &selector)
.map(|x| x.into_iter().map(|x| x.into()).collect())
.map_err(|err| state.set_error(err))
}))
}

Expand Down Expand Up @@ -177,29 +237,23 @@ pub fn http_request(lua: &mut hlua::Lua, state: State) {

pub fn http_send(lua: &mut hlua::Lua, state: State) {
lua.set("http_send", hlua::function1(move |request: String| -> Result<HashMap<AnyHashableLuaValue, AnyLuaValue>> {
let resp = match state.http_send(request) {
Ok(resp) => resp,
Err(err) => return Err(state.set_error(err)),
};
Ok(resp.into())
state.http_send(request)
.map(|resp| resp.into())
.map_err(|err| state.set_error(err))
}))
}

pub fn json_decode(lua: &mut hlua::Lua, state: State) {
lua.set("json_decode", hlua::function1(move |x: String| -> Result<AnyLuaValue> {
match json::decode(&x) {
Ok(x) => Ok(x),
Err(err) => Err(state.set_error(err)),
}
json::decode(&x)
.map_err(|err| state.set_error(err))
}))
}

pub fn json_encode(lua: &mut hlua::Lua, state: State) {
lua.set("json_encode", hlua::function1(move |x: AnyLuaValue| -> Result<String> {
match json::encode(x) {
Ok(x) => Ok(x),
Err(err) => Err(state.set_error(err)),
}
json::encode(x)
.map_err(|err| state.set_error(err))
}))
}

Expand Down Expand Up @@ -292,12 +346,9 @@ pub fn ldap_search_bind(lua: &mut hlua::Lua, state: State) {

pub fn md5(lua: &mut hlua::Lua, state: State) {
lua.set("md5", hlua::function1(move |bytes: AnyLuaValue| -> Result<AnyLuaValue> {
let bytes = match byte_array(bytes) {
Ok(bytes) => bytes,
Err(err) => return Err(state.set_error(err)),
};

Ok(lua_bytes(&md5::Md5::digest(&bytes)))
byte_array(bytes)
.map(|bytes| lua_bytes(&md5::Md5::digest(&bytes)))
.map_err(|err| state.set_error(err))
}))
}

Expand Down Expand Up @@ -382,56 +433,41 @@ pub fn randombytes(lua: &mut hlua::Lua, _: State) {

pub fn sha1(lua: &mut hlua::Lua, state: State) {
lua.set("sha1", hlua::function1(move |bytes: AnyLuaValue| -> Result<AnyLuaValue> {
let bytes = match byte_array(bytes) {
Ok(bytes) => bytes,
Err(err) => return Err(state.set_error(err)),
};

Ok(lua_bytes(&sha1::Sha1::digest(&bytes)))
byte_array(bytes)
.map(|bytes| lua_bytes(&sha1::Sha1::digest(&bytes)))
.map_err(|err| state.set_error(err))
}))
}

pub fn sha2_256(lua: &mut hlua::Lua, state: State) {
lua.set("sha2_256", hlua::function1(move |bytes: AnyLuaValue| -> Result<AnyLuaValue> {
let bytes = match byte_array(bytes) {
Ok(bytes) => bytes,
Err(err) => return Err(state.set_error(err)),
};

Ok(lua_bytes(&sha2::Sha256::digest(&bytes)))
byte_array(bytes)
.map(|bytes| lua_bytes(&sha2::Sha256::digest(&bytes)))
.map_err(|err| state.set_error(err))
}))
}

pub fn sha2_512(lua: &mut hlua::Lua, state: State) {
lua.set("sha2_512", hlua::function1(move |bytes: AnyLuaValue| -> Result<AnyLuaValue> {
let bytes = match byte_array(bytes) {
Ok(bytes) => bytes,
Err(err) => return Err(state.set_error(err)),
};

Ok(lua_bytes(&sha2::Sha512::digest(&bytes)))
byte_array(bytes)
.map(|bytes| lua_bytes(&sha2::Sha512::digest(&bytes)))
.map_err(|err| state.set_error(err))
}))
}

pub fn sha3_256(lua: &mut hlua::Lua, state: State) {
lua.set("sha3_256", hlua::function1(move |bytes: AnyLuaValue| -> Result<AnyLuaValue> {
let bytes = match byte_array(bytes) {
Ok(bytes) => bytes,
Err(err) => return Err(state.set_error(err)),
};

Ok(lua_bytes(&sha3::Sha3_256::digest(&bytes)))
byte_array(bytes)
.map(|bytes| lua_bytes(&sha3::Sha3_256::digest(&bytes)))
.map_err(|err| state.set_error(err))
}))
}

pub fn sha3_512(lua: &mut hlua::Lua, state: State) {
lua.set("sha3_512", hlua::function1(move |bytes: AnyLuaValue| -> Result<AnyLuaValue> {
let bytes = match byte_array(bytes) {
Ok(bytes) => bytes,
Err(err) => return Err(state.set_error(err)),
};

Ok(lua_bytes(&sha3::Sha3_512::digest(&bytes)))
byte_array(bytes)
.map(|bytes| lua_bytes(&sha3::Sha3_512::digest(&bytes)))
.map_err(|err| state.set_error(err))
}))
}

Expand Down