webroar 0.3.1 → 0.4.0

data/src/admin_panel/app/views/headers/_headers_table.html.erb

@@ -0,0 +1,113 @@
+<!--
+WebROaR - Ruby Application Server - http://webroar.in/
+Copyright (C) 2009  Goonj LLC
+
+This file is part of WebROaR.
+
+WebROaR is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+WebROaR is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<% expires = Headers.get_expires_value() %>  
+<table width = 95% cellpadding = "4" id = 'headers_table'>
+    <tr>
+        <td class = 'table_header' colspan = 3>
+            Headers&nbsp;&nbsp;&nbsp;<span class = 'help_link'><%=link_to_function "Help", :onclick => "addHelp('headers')" %></span>
+            <br/>
+            <div id = 'headers' class = 'font_size_12'>
+            </div>
+        </td>
+    </tr>    
+    <tr>
+        <td width = 40% class = 'BG_white'>
+            Expires&nbsp;&nbsp;&nbsp;<span class = 'help_link'><%=link_to_function "Help", :onclick => "addHelp('expires')" %>
+            </span>
+            <br/>
+            <div id = 'expires' class = 'font_size_12'>
+            </div>
+        </td>
+        <td width = 40% class = 'BG_white'>
+            <div id = 'expires_div'>
+                <%= h(expires) %>
+            </div>
+        </td>
+        <td width = 20% class = 'BG_white'>
+            <%= link_to_remote 'Edit', :update => 'expires_div', :url => {:controller => 'headers', :action => 'add_expires_text_box', :div_id => 'expires_div'} %>
+        </td>
+    </tr>
+		<tr>
+			<td class = 'sub_header' colspan = 3>
+				Expires By Type&nbsp;&nbsp;&nbsp;<span class = 'help_link'><%=link_to_function "Help", :onclick => "addHelp('expires_by_type')" %></span>
+            <br/>
+            <div id = 'expires_by_type' class = 'font_size_12'>
+            </div>
+			</td>
+		</tr>
+		<% expires_by_type_array = Headers.get_expires_by_type_array() %>		
+		<% if expires_by_type_array.length > 0 %>
+		<tr>
+			<td class = 'sub_header'>
+				Extension&nbsp;&nbsp;&nbsp;<span class = 'help_link'><%=link_to_function "Help", :onclick => "addHelp('expires_by_type_ext')" %></span>
+        &nbsp;&nbsp;&nbsp;        
+            <br/>
+            <div id = 'expires_by_type_ext' class = 'font_size_12'>
+            </div>
+			</td>
+			<td class = 'sub_header'>
+				Expires&nbsp;&nbsp;&nbsp;<span class = 'help_link'><%=link_to_function "Help", :onclick => "addHelp('expires_by_type_expires_value')" %></span>
+        &nbsp;&nbsp;&nbsp;        
+            <br/>
+            <div id = 'expires_by_type_expires_value' class = 'font_size_12'>
+            </div>
+			</td>
+			<td class = 'sub_header'>
+				
+			</td>
+		</tr>
+		<% index = 0 %>
+		<% expires_by_type_array.each do |item| %>
+		  <tr>
+		  	<td class = 'BG_white'>
+		  		<%=h item['ext'] %>
+		  	</td>
+				<td class = 'BG_white'>
+          <%=h item['expires'] %>
+        </td>
+				<td class = 'BG_white'>
+          <%=link_to_remote "Delete", :update => 'headers_div', :url => {:controller => 'headers', :action => 'delete_expires_by_type', :id => index}, :confirm => "Are you sure to delete?", :oncontextmenu => 'return false;' %>
+        </td>
+		  </tr>
+			<% index += 1%>
+		  <% end %>
+		<% end %>
+		
+</table>
+
+<div id = 'expires_by_type_form'>
+</div>
+
+<table width = 95% cellpadding = "4">		
+	<% if @restart_server_message %>
+		<tr>
+	   <td align = 'left'>
+      <span id='error_div'>
+      	<%= @restart_server_message%>
+		  </span>			
+     </td>		
+		</tr>
+		<% end %>			
+		<tr>
+			<td align = 'right'>
+				<%=link_to_remote "Add Expires By Type", :update => 'expires_by_type_form', :url => {:controller => 'headers', :action => 'add_expires_by_type_form'} %>			  
+			</td>
+		</tr>
+</table>

data/src/admin_panel/app/views/mail_specification/_current_spec.html.erb

@@ -0,0 +1,168 @@
+<!--
+WebROaR - Ruby Application Server - http://webroar.in/
+Copyright (C) 2009  Goonj LLC
+
+This file is part of WebROaR.
+
+WebROaR is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+WebROaR is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<% if File.exist?(MAIL_FILE_PATH) and info = YAML::load_file(MAIL_FILE_PATH) %>
+	<% if info['smtp'] %>
+		<table width = 95%>
+		    <tr>
+		        <td class = 'table_header_link' width = 50% colspan = 2>
+		            <b>Mail Settings :- SMTP</b>&nbsp;&nbsp;&nbsp;<span class = 'help_link'><%=link_to_function('Help', :onclick => 'addHelp("mail");') %></span>
+		            <br/>
+		            <div id = 'mail' class = 'font_size_12'>
+		            </div>
+		        </td>
+		        <td class = 'table_header_link' width = 50% colspan = 2 align = 'right'>
+		            <%=link_to_remote 'Sendmail', :update => 'mail_div', :url =>  {:controller => 'mail_specification', :action => 'sendmail_form'} %>&nbsp;&nbsp;&nbsp;
+		            <%=link_to_remote 'Edit', :update => 'mail_div', :url => {:controller => 'mail_specification', :action => 'edit_smtp', :smtp => info['smtp']} %>&nbsp;&nbsp;&nbsp;
+								<% if info['email_notification'] and info['email_notification'].downcase == 'disabled' %>
+		              <%=link_to_remote 'Enable', :update => 'mail_div', :url => {:controller => 'mail_specification', :action => 'enable_notification'}, :confirm => ENABLE_EMAIL_NOTIFICATION, :oncontextmenu => 'return false;' %>
+								<% elsif info['email_notification'] and info['email_notification'].downcase == 'enabled' %>
+								  <%=link_to_remote 'Disable', :update => 'mail_div', :url => {:controller => 'mail_specification', :action => 'disable_notification'}, :confirm => DISABLE_EMAIL_NOTIFICATION, :oncontextmenu => 'return false;' %>
+								<% end %>	
+		        </td>
+		    </tr>
+		    <tr>
+		        <td class = 'BG_dark_gray' width = 25%>
+		            Server
+		        </td>
+		        <td class = 'BG_dark_gray' width = 25%>
+		            <%=info['smtp']['address'] %>
+		        </td>
+		        <td class = 'BG_dark_gray' width = 25%>
+		            Port
+		        </td>
+		        <td class = 'BG_dark_gray' width = 25%>
+		            <%=info['smtp']['port'] %>
+		        </td>
+		    </tr>
+		    <tr>
+		        <td class = 'BG_white'>
+		            Domain
+		        </td>
+		        <td class = 'BG_white'>
+		            <%=info['smtp']['domain'] %>
+		        </td>
+		        <td class = 'BG_white'>
+		            Authenitcation
+		        </td>
+		        <td class = 'BG_white'>
+		            <%=info['smtp']['authentication'] %>
+		        </td>
+		    </tr>
+		    <tr>
+		        <td class = 'BG_dark_gray'>
+		            User Name
+		        </td>
+		        <td class = 'BG_dark_gray'>
+		            <%=info['smtp']['user_name'] %>
+		        </td>
+		        <td class = 'BG_dark_gray'>
+		            Password
+		        </td>
+		        <td class = 'BG_dark_gray'>
+		            **************
+		        </td>
+		    </tr>
+		    <tr>
+		        <td class = 'BG_white'>
+		            Sender's Email Address
+		        </td>
+		        <td class = 'BG_white'>
+		            <%=info['smtp']['from'] %>
+		        </td>
+		        <td class = 'BG_white'>
+		            Recipient Email Addresses
+		        </td>
+		        <td class = 'BG_white'>
+		            <%=info['smtp']['recipients'] %>
+		        </td>
+		    </tr>
+		    <tr>
+		    </tr>
+		</table>
+		<br/>
+		<br/>
+	<% elsif info['sendmail'] %>
+		<table width = 95%>
+		    <tr>
+		        <td class = 'table_header_link' width = 50%>
+		            <b>Mail Settings :- Sendmail</b>&nbsp;&nbsp;&nbsp;<span class = 'help_link'><%=link_to_function('Help', :onclick => 'addHelp("mail");') %></span>
+		            <br/>
+		            <div id = 'mail' class = 'font_size_12'>
+		            </div>
+		        </td>
+		        <td class = 'table_header_link' width = 50% colspan = 2 align = 'right'>
+		            <%=link_to_remote 'SMTP', :update => 'mail_div', :url => {:controller => 'mail_specification', :action => 'smtp_form'} %>&nbsp;&nbsp;&nbsp;
+		            <%=link_to_remote 'Edit', :update => 'mail_div', :url => {:controller => 'mail_specification', :action => 'edit_sendmail', :sendmail => info['sendmail']} %>&nbsp;&nbsp;&nbsp;
+		            <% if info['email_notification'] and info['email_notification'].downcase == 'disabled' %>
+                  <%=link_to_remote 'Enable', :update => 'mail_div', :url => {:controller => 'mail_specification', :action => 'enable_notification'}, :confirm => ENABLE_EMAIL_NOTIFICATION, :oncontextmenu => 'return false;' %>
+                <% elsif info['email_notification'] and info['email_notification'].downcase == 'enabled' %>
+                  <%=link_to_remote 'Disable', :update => 'mail_div', :url => {:controller => 'mail_specification', :action => 'disable_notification'}, :confirm => DISABLE_EMAIL_NOTIFICATION, :oncontextmenu => 'return false;' %>
+                <% end %> 
+		        </td>
+		    </tr>
+		    <tr>
+		        <td class = 'BG_dark_gray' width = 50%>
+		            Location
+		        </td>
+		        <td colspan = 2 class = 'BG_dark_gray'width = 50%>
+		            <%=info['sendmail']['location']%>
+		        </td>
+		    </tr>
+		    <tr>
+		        <td class = 'BG_white'>
+		            Sender's Email Address
+		        </td>
+		        <td colspan = 2 class = 'BG_white'>
+		            <%=info['sendmail']['from'] %>
+		        </td>
+		    </tr>
+		    <tr>
+		        <td class = 'BG_dark_gray'>
+		            Recipient Email Addresses
+		        </td>
+		        <td colspan = 2 class = 'BG_dark_gray'>
+		            <%=info['sendmail']['recipients'] %>
+		        </td>
+		    </tr>
+		</table>
+		<br/>
+		<br/>
+	<% end %>
+<% else %>
+	<table width = 95%>
+	    <tr>
+	        <td class = 'table_header_link' width = 80%>
+	            <b>Mail Settings</b>&nbsp;&nbsp;&nbsp;<span class = 'help_link'><%=link_to_function('Help', :onclick => 'addHelp("mail");') %></span>
+	            <br/>
+	            <div id = 'mail' class = 'font_size_12'>
+	            </div>
+	        </td>
+	        <td class = 'table_header_link' width = 10%>
+	            <%=link_to_remote 'SMTP', :update => 'mail_div', :url => {:controller => 'mail_specification', :action => 'smtp_form'} %>
+	        </td>
+	        <td class = 'table_header_link' width = 10%>
+	            <%=link_to_remote 'Sendmail', :update => 'mail_div', :url => {:controller => 'mail_specification', :action => 'sendmail_form'} %>
+	        </td>
+	    </tr>
+	</table>
+	<br/>
+	<br/>
+<% end %>

data/src/admin_panel/app/views/{admin → server_specification}/_add_div.html.erb

@@ -35,7 +35,7 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
     <%end%> 
   </span>
   <span style = "height:20px;float:right;">
-    <%remote_form_for :cancel, :update => params[:div_id], :url => {:action => 'cancel_edit', :div_id => params[:div_id], :old_value => old_value}do%>
+    <%remote_form_for :cancel, :update => params[:div_id], :url => {:controller => 'server_specification', :action => 'cancel_edit', :div_id => params[:div_id], :old_value => old_value}do%>
       <%=submit_tag 'Cancel'%>
     <%end%> 
   </span>

data/src/admin_panel/config/initializers/application_constants.rb

@@ -146,3 +146,9 @@ RACK = 'rack'
 CLOSED_EXCEPTION = 0
 OPEN_EXCEPTION = 1
 IGNORED_EXCEPTION = 2
+
+ENABLE_EMAIL_NOTIFICATION = 'Are you sure, enable email notification for the exceptions?'
+DISABLE_EMAIL_NOTIFICATION = 'Are you sure, disable email notificaion for the exceptions? This would still captures exceptions and stores into database.'
+
+EXPIRES_VALIDATION = "Possible value for expires is off or no. of seconds."
+EMPTY_STRING = "Value is empty string."

data/src/admin_panel/lib/control.rb

@@ -79,11 +79,14 @@ class Control
     streamSock.send(@req.request, 0)
     start_time = DateTime.parse(Time.now.strftime("%a %b %d %H:%M:%S %Y"))
     str = streamSock.recv(2048)
-    end_time = DateTime.parse(Time.now.strftime("%a %b %d %H:%M:%S %Y"))
-    streamSock.close
     @resp = SCGI.new
     @resp.parse(str)
-    
+    until @resp.parsing_done?
+      str = streamSock.recv(2048)
+      @resp.parse(str)
+    end
+    end_time = DateTime.parse(Time.now.strftime("%a %b %d %H:%M:%S %Y"))
+    streamSock.close
     if @resp.header("STATUS") == "OK" or @resp.header("STATUS") == "ok"
       return nil, nil
     else

data/src/admin_panel/lib/scgi.rb

@@ -18,17 +18,28 @@
 # along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 #++
 
+require 'jcode' if RUBY_VERSION.gsub(/\D/,'').to_i < 187
 #This class contructs and parse the SCGI request.
 class SCGI
-  @hash #Instance variable to store SCGI headers.
-  @request #Instance variable to store SCGI request in single string value.
-  @body #Instance variable to store SCGI request body.
-  
+#  @hash #Instance variable to store SCGI headers.
+#  @request #Instance variable to store SCGI request in single string value.
+#  @body #Instance variable to store SCGI request body.
+
   #This is the constructor function for SCGI class.
   def initialize
     @hash = Hash.new
+    @body = ''
+    @tmp_headers_length = ''
+    @headers_length = 0
+    @curr_state = :SCGI_NONE
+    @curr_key = ''
+    @curr_value = ''
+    @done = false
   end
   
+  def parsing_done?
+    @done    
+  end
   #Getter setter for request in SCGI class.
   def request
     @request
@@ -46,7 +57,7 @@ class SCGI
   
   #Adds SCGI request body.
   def body_add(body)
-    @body = body
+    @body += body
   end
   
   #Getter method for receiving SCGI headers.
@@ -56,7 +67,7 @@ class SCGI
   
   #Construct SCGI request.
   def build
-    if(@body == nil)
+    if(@body == '')
       @request = "CONTENT_LENGTH\0"+"0"+"\0"
     else
       @request = "CONTENT_LENGTH\0#{body.length}\0"
@@ -79,19 +90,61 @@ class SCGI
   end
   
   #Parse the string and build SCGI request.
-  def parse(req)
-    arr = req.split(":")
-    key = ""
-    len = arr[0]	#TODO if len.to_i == 0 then error
-    arr = arr[1].split("\0", len.to_i)
-    arr.each_index {|i|
-      if(i % 2 == 0)
-        key = arr[i]
-      else
-        header_add(key, arr[i])
-      end
-    }
-    arr = arr[-1].split(",")
-    body_add(arr[-1])
-  end
+  def parse(req)    
+    index = 0
+    req.each_char do |c|      
+      case @curr_state
+        when :SCGI_NONE
+          if c == ':'
+            @headers_length = @tmp_headers_length.to_i
+            @curr_state = :HEADER_KEY
+          elsif c < '0' or c > '9' 
+            @curr_state = :INVALID
+          else
+            @tmp_headers_length += c
+          end
+        when :HEADER_KEY
+          if c == "\0"            
+            @curr_state = :HEADER_VAL
+          elsif c == ","
+            if header('CONTENT_LENGTH').to_i == 0
+              @done = true
+              @curr_state = :DONE
+            else
+              @curr_state = :BODY
+              body_add(req[index+1, req.length])
+              if @body.length == header('CONTENT_LENGTH').to_i
+                @curr_state = :DONE
+                @done = true
+              else
+                @curr_state = :BODY
+              end
+              break
+            end
+          else
+            @curr_key += c            
+          end
+        when :HEADER_VAL
+          if c == "\0"            
+            header_add(@curr_key, @curr_value)
+            @curr_key = ''
+            @curr_value = ''
+            @curr_state = :HEADER_KEY
+          else
+            @curr_value += c
+          end
+        when :BODY
+          body_add(req[index, req.length])
+          if @body.length == header('CONTENT_LENGTH').to_i
+            @curr_state = :DONE
+            @done = true
+          end
+          break
+        when :DONE
+          @done = true
+          return
+      end    
+      index += 1
+    end    
+  end  
 end

data/src/admin_panel/lib/yaml_writer.rb

@@ -18,6 +18,13 @@
 # along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 #++
 
+module YAMLConfig
+  CONFIG = 1
+  USER = 2
+  SMTP = 3
+  SENDMAIL = 4
+end
+
 class YAMLWriter
   
   class << self
@@ -26,7 +33,7 @@ class YAMLWriter
     def write(hash, file_path, type)
       yaml_obj = YAML::dump(hash)
       file = File.open(file_path,"w")
-      if type == "config"
+      if type == YAMLConfig::CONFIG
         header_string = get_header()
         file.puts(header_string)
       end
@@ -85,6 +92,9 @@ class YAMLWriter
 #          9) Logging level(optional)(default is 'Server Specification/log_level')
 #         10) Run as user (mandatory)
 #         11) Hostnames(optional)
+#         12) Environment Variable(optional)
+#             It defines environment variables which can be used in the deployed application. It take following parameter.
+#               I) set_env(optional)(Value is key-value pair separated by equal sign('=') e.g. LOG_DIR=/var/log/webroar)             
 #        Order of the above elements does not matter.
 #        Base-uri 'admin-panel' is reserved for 'Admin Panel'.
 #        Either host_names or baseuri(not both) must present to resolve HTTP request.
@@ -103,6 +113,9 @@ class YAMLWriter
 #              min_worker: 2
 #              max_worker: 5
 #              log_level: SEVERE
+#              environment_variables: 
+#                - set_env: LOG_DIR=/var/log/webroar
+#                - set_env: TMP_DIR=/tmp
 #        Example with host_names:
 #          Application Specification:
 #            - name: Mephisto
@@ -115,24 +128,45 @@ class YAMLWriter
 #              min_worker: 2
 #              max_worker: 5
 #              log_level: SEVERE
-#  (c)  Headers (optional)
-#         It allows adding or changing the Expires and Cache-Control in the response headers for static assets (e.g. *.js, *.gif etc). 
-#         Elements:
-#           1) Expires header for all static assets (optional) (default is 'off')
-#           2) Specific expires header for specific file types (optional)
-#              Elements:
-#                 I) File Extensions(mandatory)
-#                II) Expires value(mandatory) (No of seconds)
-#         Possible value for expires is off or no. of seconds. 
-#         Example:
-#           Headers:
-#             expires: 3600
-#             expires_by_type:
-#             - ext: png, jpg, gif
-#               expires: 31536000
+#              environment_variables: 
+#                - set_env: LOG_DIR=/var/log/webroar
+#                - set_env: TMP_DIR=/tmp
+#
+#  (c) Headers (optional)
+#        It allows adding or changing the Expires and Cache-Control in the response headers for static assets (e.g. *.js, *.gif etc). 
+#        Elements:
+#          1) Expires header for all static assets (optional) (default is 'off')
+#          2) Specific expires header for specific file types (optional)
+#             Elements:
+#                I) File Extensions(mandatory)
+#               II) Expires value(mandatory) (No of seconds)
+#        Possible value for expires is off or no. of seconds. 
+#        Example:
+#          Headers:
+#            expires: 3600
+#            expires_by_type:
+#            - ext: png, jpg, gif
+#              expires: 31536000
+#
+#  (d) Encoding (optional)
+#        It allows (deflate) encoding of static assets.
+#        Elements:
+#          1) Regex value for supported Content-Type (optional) (default is 'text|xml')
+#          2) Regex value for supported Used-Agent (optional) (default is '.*')
+#          3) Range of Content-Length (optional)
+#             Elements:
+#                I) Lower limit of Content-Length (optional) (default is 1024 i.e. 1KB) 
+#               II) Upper limit of Content-Length (optional) (default is 12328960 i.e. 10MB)
+#        Example:
+#          Encoding:
+#            Content-Type: text|xml|javascript
+#            User-Agent: .*
+#            Size Limit:
+#              lower_limit: 2094
+#              upper_limit: 12328960
 #
 ######################################################################################"
     end
   end
   
-end
+end #end YAMLWriter

data/src/admin_panel/public/javascripts/application.js

@@ -143,8 +143,27 @@ function addHelp(id)
   if(id=='sendmail_location')
   {
     str="Location of the sendmail agent e.g. /usr/sbin/sendmail"
+  }  
+  if (id == 'headers') 
+  {
+    str = "It allows adding or changing the Expires and Cache-Control in the response headers for static assets (e.g. *.js, *.gif etc)."
+  }
+  if (id == 'expires') 
+  {
+    str = "Expires header for all static assets (optional) (default is 'off'). Possible value for expires is off or no. of seconds."
+  }
+  if (id == 'expires_by_type') 
+  {
+    str = "Specific expires header for specific file types."
+  }
+  if (id == 'expires_by_type_ext') 
+  {
+    str = 'File extensions separated by comma (e.g png, jpg, gif).'
+  }
+  if (id == 'expires_by_type_expires_value') 
+  {
+    str = "Expires value in no. of seconds."
   }
-
   if(id=='runasuser')
   {
 	  str=str+"<div style='width:99%;text-align:right'><a href=# onClick=\" $('application_specification_type1').show(); $('application_specification_analytics').show(); $('"+id+"').hide(); return false;\" class='calendar_link'>Close</a></div>"

data/src/head/wr_access_log.c

@@ -21,7 +21,7 @@
 #include<time.h>
 #include <wr_access_log.h>
 
-static inline  void get_date_time(char *str_time, int str_time_len) {
+ void get_date_time1(char *str_time, int str_time_len) {
   struct tm   *now      =NULL;
   time_t       time_value  =0;
 
@@ -41,7 +41,7 @@ int wr_access_log(wr_req_t* req) {
 
   if(fp) {
     char str_time[32];
-    get_date_time(str_time, 32);
+    get_date_time1(str_time, 32);
     const char *method = scgi_header_value_get(req->scgi, WR_EBB_REQ_METHOD);
     const char *uri = scgi_header_value_get(req->scgi, WR_EBB_REQ_URI);
     const char *http_version = scgi_header_value_get(req->scgi, WR_EBB_HTTP_VER);