cn/openvpn-status-web
1
0
Fork 0
mirror of https://github.com/cmur2/openvpn-status-web.git synced 2025-06-29 00:30:24 +02:00
Code Releases Activity

gem: parse any number of list headers in status-version 2/3

Browse Source
This commit is contained in:
cn
2022-01-18 01:56:15 +01:00
committed by Christian Nicolai
parent 39d2b3ce94
commit 528709c895
5 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/openvpn-status-web/main.html.erb
View File

@ -53,7 +53,7 @@ thead {
<% status.client_list_headers.each_with_index do |header,i| %>
<% if i == 0 %>
<td class="first">
<% elsif i == status.client_list_headers.length-1 %>
<% elsif i == status.client_list_headers.size-1 %>
<td class="last">
<% else %>
<td class="middle">
@ -67,13 +67,13 @@ thead {
<% status.client_list_headers.each_with_index do |header,i| %>
<% if i == 0 %>
<td class="first">
<% elsif i == status.client_list_headers.length-1 %>
<% elsif i == status.client_list_headers.size-1 %>
<td class="last">
<% else %>
<td class="middle">
<% end %>
<% if header =~ /(Received|Sent)/ %>
<%= client[i].to_i.as_bytes %></td>
<%= client[i].as_bytes %></td>
<% elsif client[i].is_a? DateTime %>
<%= client[i].strftime('%-d.%-m.%Y %H:%M:%S') %></td>
<% else %>
@ -93,7 +93,7 @@ thead {
<% status.routing_table_headers.each_with_index do |header,i| %>
<% if i == 0 %>
<td class="first">
<% elsif i == status.routing_table_headers.length-1 %>
<% elsif i == status.routing_table_headers.size-1 %>
<td class="last">
<% else %>
<td class="middle">
@ -107,7 +107,7 @@ thead {
<% status.routing_table_headers.each_with_index do |header,i| %>
<% if i == 0 %>
<td class="first">
<% elsif i == status.routing_table_headers.length-1 %>
<% elsif i == status.routing_table_headers.size-1 %>
<td class="last">
<% else %>
<td class="middle">

29
lib/openvpn-status-web/parser/modern_stateless.rb
View File

@ -11,25 +11,30 @@ module OpenVPNStatusWeb
text.lines.each do |line|
parts = line.strip.split(sep)
status.client_list_headers = ['Common Name', 'Real Address', 'Data Received', 'Data Sent', 'Connected Since']
status.client_list << parse_client(parts[1..5]) if parts[0] == 'CLIENT_LIST'
status.routing_table_headers = ['Virtual Address', 'Common Name', 'Real Address', 'Last Ref']
status.routing_table << parse_route(parts[1..4]) if parts[0] == 'ROUTING_TABLE'
status.client_list_headers = parts[2..-1] if parts[0] == 'HEADER' && parts[1] == 'CLIENT_LIST'
status.client_list << parse_client(parts[1..-1], status.client_list_headers) if parts[0] == 'CLIENT_LIST'
status.routing_table_headers = parts[2..-1] if parts[0] == 'HEADER' && parts[1] == 'ROUTING_TABLE'
status.routing_table << parse_route(parts[1..-1], status.routing_table_headers) if parts[0] == 'ROUTING_TABLE'
status.global_stats << parse_global(parts[1..2]) if parts[0] == 'GLOBAL_STATS'
end
status
end
private_class_method def self.parse_client(client)
client[2] = client[2].to_i
client[3] = client[3].to_i
client[4] = DateTime.strptime(client[4], '%a %b %d %k:%M:%S %Y')
private_class_method def self.parse_client(client, headers)
headers.each_with_index do |header, i|
client[i] = parse_date(client[i]) if header.end_with?('Since')
client[i] = client[i].to_i if header.start_with?('Bytes')
end
client
end
private_class_method def self.parse_route(route)
route[3] = DateTime.strptime(route[3], '%a %b %d %k:%M:%S %Y')
private_class_method def self.parse_route(route, headers)
headers.each_with_index do |header, i|
route[i] = parse_date(route[i]) if header.end_with?('Last Ref')
end
route
end
@ -37,6 +42,10 @@ module OpenVPNStatusWeb
global[1] = global[1].to_i
global
end
private_class_method def self.parse_date(date_string)
DateTime.strptime(date_string, '%a %b %d %k:%M:%S %Y')
end
end
end
end