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

json server fixes #730

Merged
merged 2 commits into from
Aug 30, 2017
Merged

json server fixes #730

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d3637f
prevent crashes in table_data with bad data
hplato Aug 25, 2017
25f17d6
fix json_server with http1.1 and data tables
hplato Aug 25, 2017
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
76 changes: 43 additions & 33 deletions lib/json_server.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,6 @@ sub json_get {
}

if ( $path[0] eq 'notifications' ) {

for my $i ( 0 .. $#json_notifications ) {
my $n_time = int( $json_notifications[$i]{time} );
my $x = $args{time}[0]; #Weird, does nothing, but notifications doesn't work if removed...
Expand All @@ -759,41 +758,37 @@ sub json_get {

#need to check if vars and keys exist


my $start = 0;
$start = $args{start}[0] if ( $args{start}[0] );
my $records = 0;
my $page = 0;
my $page = $json_table{ $args{var}[0] }{page}
if ( defined $json_table{ $args{var}[0] }{page} );
my $page = $json_table{ $args{var}[0] }{page} if ( defined $json_table{ $args{var}[0] }{page} );
$records = $args{records}[0] if ( $args{records}[0] );

# TODO: At some point have a hook that pulls in more data into the table if it's missing
# ie read a file

my $jt_time = int( $json_table{ $args{var}[0] }{time} );
if ( ( $args{time} && int( $args{time}[0] ) < $jt_time )
or ( !$args{time} ) )
{
if ( ( $args{time} && int( $args{time}[0] ) < $jt_time ) or ( !$args{time} ) ) {
#need to copy all the data since we can adjust starts and records

$json_data{'table_data'}{exist} =
$json_table{ $args{var}[0] }{exist};
$json_data{'table_data'}{head} =
$json_table{ $args{var}[0] }{head};
$json_data{'table_data'}{page_size} =
$json_table{ $args{var}[0] }{page_size};
$json_data{'table_data'}{hook} =
$json_table{ $args{var}[0] }{hook};
$json_data{'table_data'}{page} = $page;
@{ $json_data{'table_data'}->{data} } =
map { [@$_] } @{ $json_table{ $args{var}[0] }->{data} };

splice @{ $json_data{'table_data'}->{data} }, 0, $args{start}[0]
if ( $args{start}[0] );
splice @{ $json_data{'table_data'}->{data} }, $args{records}[0]
if ( $args{records}[0] );
$json_data{'table_data'}{records} =
scalar @{ $json_data{'table_data'}->{data} };
$json_data{'table_data'}{exist} = $json_table{ $args{var}[0] }{exist};
$json_data{'table_data'}{head} = $json_table{ $args{var}[0] }{head};
$json_data{'table_data'}{page_size} = $json_table{ $args{var}[0] }{page_size};
$json_data{'table_data'}{hook} = $json_table{ $args{var}[0] }{hook};
$json_data{'table_data'}{page} = $page;
#wrap this in an eval in case the data is bad to prevent crashes"
eval {
@{ $json_data{'table_data'}->{data} } = map { [@$_] } @{ $json_table{ $args{var}[0] }->{data} };
};
if ($@) {
&::print_log("Json_Server.pl: ERROR: problems parsing table data for " . $args{var}[0]);
} else {
splice @{ $json_data{'table_data'}->{data} }, 0, $args{start}[0] if ( $args{start}[0] );
splice @{ $json_data{'table_data'}->{data} }, $args{records}[0] if ( $args{records}[0] );
$json_data{'table_data'}{records} = scalar @{ $json_data{'table_data'}->{data} };
}
}
}
}
Expand Down Expand Up @@ -1131,6 +1126,12 @@ sub json_object_detail {
unless ( exists $a{""} ); #don't return a null value
}

elsif ( $f eq 'link' ) {
my $a = $object->$method;

$value = $a if ( defined $a and $a ne "" ); #don't return a null value
}

#if ( $f eq 'hidden' ) {
# my $a = $object->$method;
# if ($a == 1 or $a eq "1") {
Expand Down Expand Up @@ -1241,17 +1242,22 @@ sub json_page {
my ($json_raw,$options) = @_;

## utf8::encode( $json_raw ); #may need to wrap gzip in an eval and encode it if errors develop. It crashes if a < is in the text
my $output = "HTTP/1.0 200 OK\r\n";
my $output = "HTTP/1.1 200 OK\r\n";
$output .= "Server: MisterHouse\r\n";
$output .= "Connection: close\r\n";
$output .= "Content-type: application/json\r\n";
if ($options =~ m/compress/) {
print_log("json_server.pl: DEBUG: Compressing Data as requested by client") if $Debug{json};
my $json;
gzip \$json_raw => \$json;
$output .= "Content-Encoding: gzip\r\n";
$output .= "Content-Length: " . ( length $json ) . "\r\n";
$output .= "Date: " . time2str(time) . "\r\n";
$output .= "\r\n";
$output .= $json;
} else {
$output .= "Content-Length: " . ( length $json_raw ) . "\r\n";
$output .= "Date: " . time2str(time) . "\r\n";
$output .= "\r\n";
$output .= $json_raw;
}
Expand All @@ -1270,11 +1276,7 @@ sub json_entities_encode {
}

sub json_usage {
my $html = <<eof;
HTTP/1.0 200 OK
Server: MisterHouse
Content-type: text/html

my $html = <<eof;
<html>
<head>
</head>
Expand Down Expand Up @@ -1312,8 +1314,16 @@ sub json_usage {
</body>
</html>
eof
my $html_head = "HTTP/1.1 200 OK\r\n";
$html_head .= "Server: MisterHouse\r\n";
$html_head .= "Content-type: application/json\r\n";
$html_head .= "Connection: close\r\n";
$html_head .= "Content-Length: " . ( length $html ) . "\r\n";
$html_head .= "Date: " . time2str(time) . "\r\n";
$html_head .= "\r\n";


return $html;
return $html_head.$html;
}

sub json_table_create {
Expand Down Expand Up @@ -1483,14 +1493,14 @@ sub json_notification {
for my $i ( 0 .. $#json_notifications ) {

#clean up any old notifications, or empty entries (ie less than 5 seconds old)
my $n_time = int( $json_notifications[$i]{time} );
my $n_time = int( $json_notifications[$i]{time} );
if ( ( &get_tickcount > $n_time + 5000 )
or ( !defined $json_notifications[$i]{time} ) )
{
splice @json_notifications, $i, 1;
}
}
push @json_notifications, $data;
push (@json_notifications, $data);
}

sub config_checker {
Expand Down