shlist

share and manage lists between multiple people
Log | Files | Refs

commit 0e16344b8ffafc9b9454a7b0ac16744249a13c1c
parent fe97754c45294ddf5927a86b6bfcc2c257cbadfe
Author: Kyle Milz <kyle@0x30.net>
Date:   Sat, 20 Feb 2016 22:48:41 -0700

sl: move function closer to it's use

Diffstat:
Mserver/sl | 60++++++++++++++++++++++++++++++------------------------------
1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/server/sl b/server/sl @@ -155,6 +155,36 @@ while (my $client_socket = $server_socket->accept()) { } } +# Takes a request and verifies device_id is present and valid +sub get_device { + my ($db, $request) = @_; + + unless (exists $request->{'device_id'}) { + $log->print("bad request, missing key 'device_id'\n"); + return ("a missing message argument was required"); + } + + my $device_id = $request->{'device_id'}; + unless ($device_id && $device_id =~ m/^[a-zA-Z0-9+\/=]+$/) { + $log->print("bad device id\n"); + return ('the client sent a device id that was not base64'); + } + + $db->{select_device_id}->execute($device_id); + if (my ($num, $id, $phnum) = $db->{select_device_id}->fetchrow_array()) { + my $device = { + num => $num, + fp => fingerprint($id), + phnum => $phnum, + id => $id + }; + return (undef, $device); + } + + $log->print("unknown device '$device_id'\n"); + return ('the client sent an unknown device id'); +} + # Connect to a UNIX file system socket and send a JSON encoded message # Returns nothing. sub send_unix { @@ -787,33 +817,3 @@ sub make_ok { $args->{status} = 'ok'; return $args; } - -# Takes a request and verifies device_id is present and valid -sub get_device { - my ($db, $request) = @_; - - unless (exists $request->{'device_id'}) { - $log->print("bad request, missing key 'device_id'\n"); - return ("a missing message argument was required"); - } - - my $device_id = $request->{'device_id'}; - unless ($device_id && $device_id =~ m/^[a-zA-Z0-9+\/=]+$/) { - $log->print("bad device id\n"); - return ('the client sent a device id that was not base64'); - } - - $db->{select_device_id}->execute($device_id); - if (my ($num, $id, $phnum) = $db->{select_device_id}->fetchrow_array()) { - my $device = { - num => $num, - fp => fingerprint($id), - phnum => $phnum, - id => $id - }; - return (undef, $device); - } - - $log->print("unknown device '$device_id'\n"); - return ('the client sent an unknown device id'); -}