Merge branch 'po/disable-prog-ini'

TurboGit · TurboGit · commit ad2cb268eb2b · 2020-06-05T09:19:57.000+02:00
* po/disable-prog-ini:
  Do not part program specific ini file if asked.
  New configuration option Disable_Program_Ini.
diff --git a/docs/build.adb b/docs/build.adb
@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                              Ada Web Server                              --
 --                                                                          --
---                     Copyright (C) 2000-2018, AdaCore                     --
+--                     Copyright (C) 2000-2020, AdaCore                     --
 --                                                                          --
 --  This is free software;  you can redistribute it  and/or modify it       --
 --  under terms of the  GNU General Public License as published  by the     --
@@ -144,6 +144,7 @@ begin
    Add ("SESSION_ID_LENGTH", Default.Session_Id_Length);
    Add ("TLS_TICKET_SUPPORT", Default.TLS_Ticket_Support);
    Add ("CONFIG_DIRECTORY", Default.Config_Directory);
+   Add ("DISABLE_PROGRAM_INI", Default.Disable_Program_Ini);
    Add ("USER_AGENT", Default.User_Agent);
    Add ("SERVER_HEADER", Default.Server_Header);
    Text_IO.Put_Line ("""""""");
diff --git a/docs/source/using_aws.rst b/docs/source/using_aws.rst
@@ -862,6 +862,17 @@ Current supported options are:
   Specify the filename for the directory browser template page. The
   default value is |DIRECTORY_BROWSER_PAGE|.
 
+*Disable_Program_Ini (boolean)*
+
+  .. index:: Disable_Program_Ini
+
+  Specify whether the configuration file :file:`program_name.ini` should be
+  parsed or not. If this option is set to FALSE the program specific
+  configuration file won't be parsed. This may be useful if another
+  application is using such a file and cannot be shared. This setting
+  is expected to be set in :file:`aws.ini` before the :file:`program_name.ini`
+  file is parsed. The default value is |DISABLE_PROGRAM_INI|.
+
 *Down_Image (string)*
 
   .. index:: Down_Image
diff --git a/regtests/0327_prog_config/prog_config.adb b/regtests/0327_prog_config/prog_config.adb
@@ -0,0 +1,51 @@
+------------------------------------------------------------------------------
+--                              Ada Web Server                              --
+--                                                                          --
+--                       Copyright (C) 2020, AdaCore                        --
+--                                                                          --
+--  This is free software;  you can redistribute it  and/or modify it       --
+--  under terms of the  GNU General Public License as published  by the     --
+--  Free Software  Foundation;  either version 3,  or (at your option) any  --
+--  later version.  This software 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   --
+--  distributed  with  this  software;   see  file COPYING3.  If not, go    --
+--  to http://www.gnu.org/licenses for a complete copy of the license.      --
+------------------------------------------------------------------------------
+
+with Ada.Text_IO;
+
+with AWS.Config;
+with AWS.Utils;
+
+procedure Prog_Config is
+
+   use Ada;
+   use AWS;
+
+   Conf : constant Config.Object := Config.Get_Current;
+   --  Config as read from the ini files
+
+   -------------
+   -- Display --
+   -------------
+
+   procedure Display (O : Config.Object) is
+   begin
+      Text_IO.Put_Line
+        ("Disable Program Ini : "
+         & Boolean'Image (Config.Disable_Program_Ini));
+      Text_IO.Put_Line (Config.Server_Name (O));
+      Text_IO.Put_Line (Config.WWW_Root (O));
+      Text_IO.Put_Line (Utils.Image (Config.Server_Port (O)));
+      Text_IO.Put_Line (Utils.Image (Config.Max_Connection (O)));
+      Text_IO.Put_Line (Config.Directory_Browser_Page (O));
+      Text_IO.New_Line;
+   end Display;
+
+begin
+   Display (Conf);
+end Prog_Config;
diff --git a/regtests/0327_prog_config/prog_config.gpr b/regtests/0327_prog_config/prog_config.gpr
@@ -0,0 +1,24 @@
+------------------------------------------------------------------------------
+--                              Ada Web Server                              --
+--                                                                          --
+--                       Copyright (C) 2020, AdaCore                        --
+--                                                                          --
+--  This is free software;  you can redistribute it  and/or modify it       --
+--  under terms of the  GNU General Public License as published  by the     --
+--  Free Software  Foundation;  either version 3,  or (at your option) any  --
+--  later version.  This software 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   --
+--  distributed  with  this  software;   see  file COPYING3.  If not, go    --
+--  to http://www.gnu.org/licenses for a complete copy of the license.      --
+------------------------------------------------------------------------------
+
+with "aws";
+
+project Prog_Config is
+   for Source_Dirs use (".");
+   for Main use ("prog_config.adb");
+end Prog_Config;
diff --git a/regtests/0327_prog_config/prog_config.ini b/regtests/0327_prog_config/prog_config.ini
@@ -0,0 +1,2 @@
+directory_browser_page	prog_config.ini-directory_browser_page
+max_connection		10
diff --git a/regtests/0327_prog_config/test.out b/regtests/0327_prog_config/test.out
@@ -0,0 +1,13 @@
+Disable Program Ini : FALSE
+AWS Module
+./
+8080
+10
+prog_config.ini-directory_browser_page
+
+Disable Program Ini : TRUE
+AWS Module
+./
+8080
+5
+aws.ini-directory_browser_page
diff --git a/regtests/0327_prog_config/test.py b/regtests/0327_prog_config/test.py
@@ -0,0 +1,14 @@
+from test_support import *
+
+with open('aws.ini', 'w') as ini_file:
+    ini_file.write("status_page	aws.ini-status_page\n")
+    ini_file.write("directory_browser_page aws.ini-directory_browser_page\n")
+
+build_and_run('prog_config')
+
+with open('aws.ini', 'w') as ini_file:
+    ini_file.write("status_page	aws.ini-status_page\n")
+    ini_file.write("directory_browser_page aws.ini-directory_browser_page\n")
+    ini_file.write("disable_program_ini true\n")
+
+run('prog_config')
diff --git a/src/core/aws-config.adb b/src/core/aws-config.adb
@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                              Ada Web Server                              --
 --                                                                          --
---                     Copyright (C) 2000-2019, AdaCore                     --
+--                     Copyright (C) 2000-2020, AdaCore                     --
 --                                                                          --
 --  This library is free software;  you can redistribute it and/or modify   --
 --  it under terms of the  GNU General Public License  as published by the  --
@@ -237,6 +237,15 @@ package body AWS.Config is
       return To_String (O.P (Directory_Browser_Page).Str_Value);
    end Directory_Browser_Page;
 
+   -------------------------
+   -- Disable_Program_Ini --
+   -------------------------
+
+   function Disable_Program_Ini return Boolean is
+   begin
+      return Process_Options (Disable_Program_Ini).Bool_Value;
+   end Disable_Program_Ini;
+
    ----------------
    -- Down_Image --
    ----------------
@@ -430,8 +439,11 @@ package body AWS.Config is
       Read_If_Present
         (Config_Directory & OS_Lib.Directory_Separator & "aws.ini");
       Read_If_Present ("aws.ini");
-      Read_If_Present (Ini.Program_Ini_File (Full_Path => True));
-      Read_If_Present (Ini.Program_Ini_File (Full_Path => False));
+
+      if not Disable_Program_Ini then
+         Read_If_Present (Ini.Program_Ini_File (Full_Path => True));
+         Read_If_Present (Ini.Program_Ini_File (Full_Path => False));
+      end if;
    end Load_Config;
 
    -------------------
diff --git a/src/core/aws-config.ads b/src/core/aws-config.ads
@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                              Ada Web Server                              --
 --                                                                          --
---                     Copyright (C) 2000-2019, AdaCore                     --
+--                     Copyright (C) 2000-2020, AdaCore                     --
 --                                                                          --
 --  This library is free software;  you can redistribute it and/or modify   --
 --  it under terms of the  GNU General Public License  as published by the  --
@@ -382,6 +382,9 @@ package AWS.Config is
    function Config_Directory return String with Inline;
    --  Directory where AWS parameter files are located
 
+   function Disable_Program_Ini return Boolean with Inline;
+   --  Whether the <program_name>.ini file should be read
+
    function Transient_Cleanup_Interval return Duration with Inline;
    --  Number of seconds between each run of the cleaner task to remove
    --  transient pages.
@@ -520,6 +523,7 @@ private
       Session_Cleaner_Priority,
       Service_Priority,
       Config_Directory,
+      Disable_Program_Ini,
       User_Agent,
       Transient_Cleanup_Interval,
       Transient_Lifetime,
@@ -796,6 +800,9 @@ private
                         Config_Directory             =>
                           (Str, +Default.Config_Directory),
 
+                        Disable_Program_Ini          =>
+                          (Bool, Default.Disable_Program_Ini),
+
                         User_Agent                   =>
                           (Str, +Default.User_Agent),
 
diff --git a/src/core/aws-default.ads b/src/core/aws-default.ads
@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                              Ada Web Server                              --
 --                                                                          --
---                     Copyright (C) 2000-2019, AdaCore                     --
+--                     Copyright (C) 2000-2020, AdaCore                     --
 --                                                                          --
 --  This library is free software;  you can redistribute it and/or modify   --
 --  it under terms of the  GNU General Public License  as published by the  --
@@ -157,6 +157,7 @@ package AWS.Default with Pure is
    Security                        : constant Boolean := False;
    Security_Mode                   : constant String  := "TLS";
    Config_Directory                : constant String  := ".config/ada-web-srv";
+   Disable_Program_Ini             : constant Boolean := False;
    Cipher_Priorities               : constant String  := "";
    TLS_Ticket_Support              : constant Boolean := False;
    Certificate                     : constant String  := "cert.pem";

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+directory_browser_page prog_config.ini-directory_browser_page`
	`2`	`+max_connection 10`