From b157a5dc721a73d989124314a2ac76a02b0148c3 Mon Sep 17 00:00:00 2001 From: Bart Van Der Meerssche Date: Sun, 27 Mar 2011 11:19:58 +0000 Subject: [PATCH] [api] use sensor id to determine the corresponding hash key --- server/api/flukso/src/flukso.erl | 2 +- server/api/flukso/src/flukso_sensor_xyz.erl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/api/flukso/src/flukso.erl b/server/api/flukso/src/flukso.erl index 59a9cb3..67cf8da 100644 --- a/server/api/flukso/src/flukso.erl +++ b/server/api/flukso/src/flukso.erl @@ -31,7 +31,7 @@ ensure_started(App) -> mysql_prepare() -> mysql:prepare(permissions, <<"SELECT permissions FROM logger_tokens WHERE meter = ? AND token = ?">>), - mysql:prepare(device_key, <<"SELECT sha FROM logger_devices WHERE device = ?">>). + mysql:prepare(device_key, <<"SELECT sha FROM (logger_devices ld INNER JOIN logger_meters lm ON ld.device = lm.device) WHERE lm.meter = ?">>). %% @spec start_link() -> {ok,Pid::pid()} %% @doc Starts the app for inclusion in a supervisor tree diff --git a/server/api/flukso/src/flukso_sensor_xyz.erl b/server/api/flukso/src/flukso_sensor_xyz.erl index 1ddd8eb..ce8c4b5 100644 --- a/server/api/flukso/src/flukso_sensor_xyz.erl +++ b/server/api/flukso/src/flukso_sensor_xyz.erl @@ -90,8 +90,8 @@ is_authorized(ReqData, State) -> 'GET' -> is_auth_GET(ReqData, State) end. -is_auth_POST(ReqData, #state{device = Device, digest = ClientDigest} = State) -> - {data, Result} = mysql:execute(pool, device_key, [Device]), +is_auth_POST(ReqData, #state{rrdSensor = Sensor, digest = ClientDigest} = State) -> + {data, Result} = mysql:execute(pool, device_key, [Sensor]), [[Key]] = mysql:get_result_rows(Result), Data = wrq:req_body(ReqData), <> = crypto:sha_mac(Key, Data),