2016-11-16  Michael Wiegand <michael.wiegand@greenbone.net>

	Preparing the ospd 1.2.0 release.

	* CHANGES: Updated.

	* ospd/__init__.py: Set version to 1.2.0.

2016-11-15  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* test/testSSHDaemon.py (TestSSH): Fix for new syntax for user/pass
	parameter.

2016-08-31  Michael Wiegand <michael.wiegand@greenbone.net>

	* doc/HTML.xsl, doc/OSP.xml: Use consistent domain name in mail
	addresses.

2016-02-25  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	* doc/OSP.xml: Changed version back to 1.1. There is no need to
	increase as 1.1 is in the works. Consequently therefore removed
	the documentation of intermediate state of credentials elements.

2016-02-24  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd_ssh.py (OSPDaemonSimpleSSH [run_command]): Return None on
	ValueError exception.

2016-02-24  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd_ssh.py (SSH_SCANNER_PARAMS): Change username:password
	parameter name to username_password for xml format correctness.
	(OSPDaemonSimpleSSH [run_command]): Adjust the username and password
	getter.

2016-02-22  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd_ssh.py (SSH_SCANNER_PARAMS): Regroup username and password
	parameters into a single one.

	* doc/OSP.xml: Update documentation.

2016-01-14  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	* doc/OSP.xml: Added documentation about new/changed
	parameter types.

2016-01-08  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd_ssh.py (SSH_SCANNER_PARAMS): Change parameter types to
	credential_username and credential_password.

2015-10-22  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon.handle_stop_scan_command): Check that scan_id
	attribute is not empty. Improve log message.

2015-10-16  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	Post release version bump.

	* ospd/__init__.py: Updated from 1.2b1 to 1.2b2.

2015-10-16  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	Preparing the ospd 1.2b1 release.

	* CHANGES: Updated.

2015-10-16  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* doc/OSP.xml: Update get_scanner_details documentation.

2015-10-16  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (BASE_SCANNER_PARAMS): Add mandatory attribute to
	parameters.
	(OSPDaemon._preprocess_scan_params): Check if a missing scanner
	parameter is mandatory.
	(OSPDaemon.get_scanner_param_mandatory): New method.
	(OSPDaemon.get_scanner_params_xml): Add mandatory element to param xml.

	* ospd/ospd_ssh.py (SSH_SCANNER_PARAMS): Add mandatory attribute to
	parameters.

2015-10-16  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	* ospd/__init__.py: Increased version to 1.2b1.
	This is necessary due to the mistake of mine with the
	post-release version bump that should have been 1.1b1
	and not 1.1.0.
	With increasing to 1.2b1 it is safe for any dependencies
	of osp-server installations.
	There will be no opsd 1.1* release.

2015-10-14  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (COMMANDS_TABLE): Add ports attribute to start_scan.

	* doc/HTML.xsl (changes, change): New templates.
	(protocol): Add changes section.

	* doc/OSP.xml: Update documentation to match start_scan new attribute
	and stop_scan command addition.

2015-10-13  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (ScanCollection.__init__): Initialize data manager to
	none.
	(ScanCollection.create_scan): Create data manager process if not done
	already.
	(ScanCollection.delete_scan): Delete data manager process if no scans
	are left.

2015-10-12  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon.check_scan_process): Don't leave defunct
	process when scan is finished

2015-10-12  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* tests/testSSHDaemon.py, tests/testScanAndResult.py: Update class
	method calls.

2015-10-12  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (ScanCollection.create_scan): Add ports parameter.
	(ScanCollection.get_ports): New method.

	* ospd/ospd.py (OSPDaemon [handle_start_scan_command, create_scan]):
	Handle start_scan ports attribute.
	(OSPDaemon.get_scan_ports): New method.
	(OSPDaemon.handle_client_stream): Add debug message.

2015-10-09  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	Post branch version bump.

	* ospd/__init__.py, doc/OSP.xml: Increased version from 1.0.3 to 1.1.0.

	* ospd/ospd.py: Increased PROTOCOL_VERSION from 1.0 to 1.1.

2015-10-09  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py: Don't import psutil module.
	(OSPDaemon.handle_stop_scan_command): Terminate process group.
	(OSPDaemon [start_scan, dry_run_scan]): Set scan's process ID as group
	ID.

2015-10-05  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (ScanCollection.create_scan): Add scan_id method
	parameter.
	(valid_uuid): New function.

	* ospd/ospd.py (COMMANDS_TABLE): Add stop_scan command. Add scan_id
	attribute for start_scan command.
	(OSPDaemon.handle_start_scan_command): Use scan_id command attribute.
	(OSPDaemon.handle_stop_scan_command): New method.
	(OSPDaemon.handle_command): Handle stop_scan command.
	(OSPDaemon.create_scan): Take scan_id parameter.
	(OSPDaemon.delete_scan): Remove scan_processes entry too.

	* doc/OSP.xml: Update documentation.

2015-09-30  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (ScanCollection.__init__): Initialized shared data manager.
	(ScanCollection.add_result): Adjust results appending.
	(ScanCollection.create_scan): Use shared dictionnary for scan info.
	Don't set exec_thread.
	(ScanCollection [get_thread, set_thread]): Remove methods.

	* ospd/ospd.py (OSPDaemon.__init__): Initialize scan_processes dict.
	(OSPDaemon [handle_get_scans_command])): Use multiprocessing instead of
	threading. Adjust accordingly.
	(OSPDaemon([handle_delete_scan_command]): Adjust called methods name.
	(OSPDaemon.check_scan_thread): Rename to check_scan_process(), adjust
	accordingly.
	(OSPDaemon.get_scan_thread): Remove method.

2015-09-22  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/ospd.py: Don't dump kb (Mb ?) in the logging system.

2015-09-09  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon.handle_start_scan_command): Set scan thread
	name.

2015-09-21  Michael Wiegand <michael.wiegand@greenbone.net>

	* ospd/ospd.py (OSPDaemon.__init__): Update comment to refer to the
	script replacing openvas-mkcert as well.

2015-09-16  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/ospd.py: Make the 'selection's work again.

2015-09-09  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon.start_scan): Handle unknown host status case.

2015-09-08  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/ospd.py: comparison to None should be 'if cond is None:'

2015-09-08  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/ospd.py: do not compare types, use 'isinstance()'

2015-09-07  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon.start_scan): Handle exec_scan() return value.

2015-09-07  Benot Allard  <benoit.allard@greenbone.net>

	* tests/testTargetConvert.py, ospd/misc.py: Fix the broken test case.

2015-09-07  Benot Allard  <benoit.allard@greenbone.net>

	* tests/testTargetConvert.py: Add a test suite for a broken case.

2015-09-01  Benot Allard  <benoit.allard@greenbone.net>

	Post release version bump

	* ospd/__init__.py: Updated

2015-09-01  Benot Allard  <benoit.allard@greenbone.net>

	Prepare release of ospd-1.0.2

	* CHANGES, INSTALL: Updated

2015-09-01  Benot Allard  <benoit.allard@greenbone.net>

	* tox.ini: Added (py27, py33, py34, pypy are tested.)

2015-08-28  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/ospd_ssh.py, tests/testSSHDaemon.py: Don't crash hard when
	  importing the ospd_ssh module when no paramiko is there. Add tests.

2015-07-28  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	* INSTALL: Added dependency info about paramiko.

	* README: Added missing modules. Added a hint on online tutorial.

2015-08-27  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/ospd_ssh.py, ospd/ospd.py, ospd/win_socket.py, ospd/misc.py:
	  Make PEP8 happier (syntaxic improvements)

2015-08-26  Sven Haardiek <sven.haardiek@greenbone.net>

	* tests/testScanAndResult.py: Fix test to work on slower machines.

2015-08-13  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon.handle_get_scans_command): Default details
	value to True for backward compatibility.

2015-08-13  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon.handle_get_scans_command): Set details to
	False when None or '0'.

	* doc/OSP.xml: Update documentation.

2015-08-10  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (create_args_parser): Fix for pre-2.7.9 Python versions.

2015-08-07  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/ospd.py: Fix the handling of the scanner parameters in a way
	  that doesn't require a change of all implemented daemons.

2015-08-04  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon.process_scan_params): Set default values.
	Validate values.
	(OSPDaemon.handle_start_scan_command): Remove default parameters value
	setting.

2015-08-04  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon.process_scan_params): Integerify integer and
	boolean parameters.
	(OSPDaemon.get_scanner_param_type): New method.
	(OSPDaemon.get_scanner_param_default): Improve checks.

2015-08-04  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (close_client_stream): Handle OSError exception. Get
	peername before shutting down socket.

2015-08-03  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/ospd.py: Not all exceptions have a 'message', let the str
	  conversion do its magic.

2015-07-24  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	* ospd/ospd_ssh.py: New. A scanner base class that handles a simple
	ssh command on a target host.

2015-07-23  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (create_args_parser): Update --syslog documentation.
	(get_common_args): Set --syslog when --background is set.

2015-07-23  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* doc/HTML.xsl: Don't set id for some elements as it is unused.

2015-07-23  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* doc/HTML.xsl, doc/OSP.xml: Add scanner parameters types documentation.

2015-07-22  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (create_args_parser): Use cacert_file argument type for
	--ca-file instead of --cert-file.

2015-07-22  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (cacert_file): New function.
	(create_args_parser): Set --cert-file argument type to cacert_file.

2015-07-21  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (KEY_FILE, CERT_FILE): Change defaults value to server
	certs instead of client certs.

2015-07-17  Benot Allard  <benoit.allard@greenbone.net>

	Improve python3 support.

	First test are working fine, testsuite is passing.

	* ospd/ospd.py, tests/testOSPDError.py, tests/testScanAndResult.py:
	  Style update.

2015-07-17  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/misc.py, ospd/ospd.py, tests/testScanAndResult.py: Progress
	  toward python3 support.

2015-07-17  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/win_socket.py: Added
	* ospd/misc.py: Add platform dependant version of the inet functions.

2015-07-17  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/ospd.py [OSPDaemon.run]: Properly close the server socket when
	  we're done.

2015-07-16  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/misc.py: Fix the usage of undocumented strftime format string.

2015-07-16  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/misc.py: Initialize the parameter in the same order as the base
	  class.

2015-07-15  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon.handle_start_scan_command): Set null
	scanner parameter value to empty string.

2015-07-14  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon.handle_get_scanner_details): Fix docstring.

2015-07-14  Michael Wiegand <michael.wiegand@greenbone.net>

	* ospd/__init__.py: Post release version bump.

2015-07-14  Michael Wiegand <michael.wiegand@greenbone.net>

	Preparing the ospd 1.0.1 release.

	* CHANGES: Updated.

2015-07-14  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/ospd.py: Fix more serialization issue, add qod to log messages.

2015-07-13  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (simple_response_str): Stringify value. Fixes an
	exception when value is an int.

2015-07-13  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/ospd.py [get_scanner_params_xml]: Fix the absence of default
	  value.

2015-07-13  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/ospd.py [get_scanner_params_xml]: De-duplicate the parameter
	  list.

2015-07-13  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	* ospd/ospd.py (OSPDaemon.add_scan_log): Also the log results should
	be able to have a "test_id", not only the alarms.

2015-07-10  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon.start_scan): Do not resolve target hostname.

2015-07-10  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/ospd.py: Remove unused import

2015-07-09  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/ospd.py: Stop hand-crafting XML message, use libraries.
	* tests/testOSPDError.py: Update test.
	* tests/testScanAndResult.py: Add integration tests

2015-07-09  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/doc/: Remove empty extra directory.

2015-06-19  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (ScanCollection.add_result): Add qod parameter.

	* ospd/ospd.py (get_result_xml): Print result qod too.
	(OSPDaemon.add_scan_alarm): Add qod parameter.

2015-06-10  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (get_result_xml): Encode value string before xml
	escaping.

2015-06-08  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	* ospd/ospd.py (OSPDaemon.set_scan_progress): Improved docstring.

2015-05-28  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	* INSTALL: Updates with some more hints.

2015-05-28  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (resolve_hostname): New function.

	* ospd/ospd.py (OSPDaemon [start_scan, dry_run_scan]): Resolve hostname
	so that results sent by scanner are always in IP format.

2015-05-28  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* doc/OSP.xml: Update example response documentation for get_scans
	command.

2015-05-28  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (ScanCollection [add_result]): Add port parameter.
	(ScanCollection [add_alarm, add_log, add_error, add_host_detail]):
	Remove methods.

	* ospd/ospd.py (OSPDaemon [add_scan_log, add_scan_error])
	([add_scan_alarm, add_host_detail]): Add port parameter. Adjust scan
	collection method call.

2015-04-16  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon [handle_start_scan_command]): Handle dry run
	case.
	(OSPDaemon [start_scan]): Remove dry run case handling.
	(OSPDaemon [dry_run_case]): Get target string as method argument. Call
	finish_scan().

2015-04-08  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (BASE_SCANNER_PARAMS): Add dry_run parameter.
	(OSPDaemon [start_scan]): Handle dry_run scanner parameter.
	(OSPDaemon [dry_run_scan]): New method.

2015-03-27  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	* ospd/__init__.py: Post release version bump.

2015-03-27  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	Preparing the ospd 1.0.0 release.

	* CHANGES: Updated.

	* README: Fix sentence.

2015-03-27  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	* INSTALL: Added some aspects on documentation and added a note
	about the tests.

2015-03-24  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* INSTALL: Adjust tests running command.

	* ospd/__init__.py: Set version to 1.0.0 to follow OpenVAS versions
	scheme.

2015-03-24  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	* INSTALL: Drop "install-scripts" from setup call as this
	is not necessary anymore for this module.

	* README: Small improvements and added small section
	about writing your own wrapper.

	* ospd/misc.py: Added a comment and update copyright year.

2015-03-24  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* INSTALL: Add section about running tests.

	* doc/OSP.xml, ospd/__init__.py, ospd/ospd.py: Set version to 1.0.

2015-02-13  Benot Allard  <benoit.allard@greenbone.net>

	* tests/testOSPDError.py: Make test pass again.

2015-02-13  Michael Wiegand <michael.wiegand@greenbone.net>

	* ospd/__init__.py: Post release version bump.

2015-02-13  Michael Wiegand <michael.wiegand@greenbone.net>

	Preparing the ospd 1.0b7 release.

	* CHANGES: Updated.

2015-02-03  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (BASE_SCANNER_PARAMS): New dictionnary for base osp
	scanner parameters.
	(OSPDaemon [__init__]): Add base scanner parameters.
	(OSPDaemon [init_scanner_parameters]): Rename to add_scan_parameter,
	take a name and a parameter to add, instead of a dictionnary of
	parameters to set the scanner parameters to.

2015-02-02  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (main): In syslog case, close stdout/stderr and open them
	as the same syslog logging handler file.

2015-01-29  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon [run]): Remove unnecessary try/finally as
	exceptions are handled in called functions.

2015-01-29  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon [bind_socket, close_client_stream]): Move
	methods to being separate functions.
	(OSPDaemon [start_daemon]): Remove function.

2015-01-22  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon [handle_client_stream]): Handle commands
	exceptions and adequately output traceback by the logger.

2015-01-20  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py: Fix miscellaneous pylint issues. Add functions and
	methods docstrings.

2015-01-20  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/__init__.py: Add module docstring.

	* ospd/misc.py: Add functions and methods docstrings, specify exceptions
	types, improve code style and fix various pylint errors.

2015-01-16  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/ospd.py (get_result_xml): Fix formatting again.

2015-01-15  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/ospd.py (start_scan): Print the exception
	* (run): Always close the stream

2015-01-14  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/__init__.py: Post release version bump.

2015-01-14  Benot Allard  <benoit.allard@greenbone.net>

	* CHANGES: Prepare for 1.0b6 release

2015-01-14  Benot Allard  <benoit.allard@greenbone.net>

	Improve PEP8 compliance (autopep8)

	* ospd/ospd.py, ospd/misc.py: Updated

2015-01-14  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (ScanCollection [add_result]): Add test_id method
	argument and set result test_id.
	(ScanCollection [add_alarm, add_log, add_error, add_host_detail]):
	Adjust methods calls.

	* ospd/ospd.py (OSPDaemon [add_scan_alarm]): Adjust scan collection
	method call.
	(OSPDaemon [__init__]): Set correct daemon version value.
	(get_result_xml): Add result test_id as xml attribute.

	* ospd/__init__.py: Fix syntax error.

2015-01-14  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/__init__.py: Post release version bump.

2015-01-14  Benot Allard  <benoit.allard@greenbone.net>

	* CHANGES: Prepare for 1.0b5 release

2015-01-14  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/ospd.py: Rename OSP_VERSION in PROTOCOL_VERSION for clarity

2015-01-14  Benot Allard  <benoit.allard@greenbone.net>

	Unify version handling.

	* ospd/__init__.py, ospd/ospd.py, setup.py: Updated

2015-01-14  Benot Allard  <benoit.allard@greenbone.net>

	* setup.py: Cleanup.

2015-01-13  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (ScanCollection (add_host_detail): New method.
	(ResultType [HOST_DETAIL]): New type.
	(ResultType [get_str, get_type]): Handle new result type.

	* ospd/ospd.py (OSPDaemon [add_scan_host_detail]): New method.

2015-01-12  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/ospd.py (get_result_xml): Fix result formatting (remove leading
	  spaces in body).
	* ospd/ospd.py (OSPDaemon [get_scan_results_xml]): Optimize string
	  creation (perform only one costly join).

2015-01-08  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (ScanCollection [add_result]): Make sure that a result
	has at least a name or a description.

2015-01-07  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (target_to_ipv4_cidr): Adjust comparison.
	(target_to_ipv6_cidr, target_to_hostname): New functions.
	(ipv6_range_to_list): Use range instead of xrange which may overflow.
	(target_to_list): Handle IPv6 CIDR and hostname formats.
	(target_str_to_list): Uniquify the targets list.

2015-01-07  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (target_to_ipv4_cidr): New function.
	(target_to_list): Handle IPv4 CIDR format.

2015-01-07  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (target_to_ipv6_short): New function.
	(target_to_list): Handle IPv6 short-range format.

2015-01-07  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (ipv4_range_to_list, target_to_ipv4_short)
	(target_to_ipv4_long): Adjust to handle exceptions explicitly.
	(ipv6_range_to_list, target_to_ipv6_long): New functions.
	(target_to_list): Handle IPv6 long-range format.

2015-01-06  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (ipv4_range_to_list, target_to_ipv4_short)
	(target_to_ipv4_long): New functions.
	(target_to_list): Handle IPv4 short-range and long-range formats.

2015-01-06  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (target_to_ipv4, target_to_ipv6, target_to_list): New
	functions.
	(target_str_to_list): Call target_to_list() function accordingly.

2015-01-05  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon [start_scan]): Update scan progress value
	accordingly.

2014-12-31  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon [handle_start_scan_command]): Start new thread
	for the scan and adjust method accordingly.
	(OSPDaemon [start_scan]): Loop over hosts of the targets string and
	handle exceptions for hosts scan threads accordingly.

2014-12-31  Hani Benhabiles <hani.benhabiles@greenbone.net>

	[ba] Adds support for scan of multiple hosts.

	* ospd/misc.py (ScanCollection [add_result]): New method.
	(ScanCollection [add_alarm, add_log, add_error]): Refactor code to use
	new add_result class method. Add host method parameter.
	(target_str_to_list): New function.

	* ospd/ospd.py (get_results_xml): Adjust to output result host in xml.
	(OSPDaemon [handle_start_scan_command]): Adjust to handle mult-host
	targets strings.
	(OSPDaemon [exec_scan]): Add method argument for target host.
	(OSPDaemon [start_scan]): Return the scan thread. Add method argument
	for target host.
	(OSPDaemon [handle_timeout]): Don't finish the scan as there might be
	other hosts to scan. Adjust add_scan_error() method call.
	(OSPDaemon [check_scan_thread]): Adjust add_scan_error() method call.
	(OSPDaemon [add_scan_log, add_scan_error, add_scan_alarm]): Add host
	method argument. Adjust scan_collection methods calls accordingly.

2014-12-16  Benot Allard  <benoit.allard@greenbone.net>

	* INSTALL: We don't support python3.

2014-12-16  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	Moved w3af wrapper into module osp-servers/w3af.

	* README, INSTALL: Dropped text about w3af.

	* setup.py: Drop handling of w3af wrapper.

	* wrappers/w3af/ospd-w3af.py, wrappers/w3af/, wrappers/: Removed.

2014-12-15  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	Moved ovaldi wrapper into module osp-servers/ovaldi.

	* README, INSTALL: Dropped text about ovaldi.

	* setup.py: Drop handling of ovaldi wrapper.

	* ovaldi/doc/, ovaldi/ospd-ovaldi.py, ovaldi/sampledata/, ovaldi/:
	Removed.

2014-12-15  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/ovaldi/ospd-ovaldi.py (OSPD_OVALDI_PARAMS): Change
	definitions_file type to ovaldef_file.

2014-12-11  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon [__init__]): Initialize scanner_info.
	(OSPDaemon [get_scanner_name, get_scanner_version]
	[get_scanner_description]): Implement methods to return correct value.

	* wrappers/ovaldi/ospd-ovaldi.py (OSPDovaldi),
	wrappers/w3af/ospd-w3af.py (OSPDw3af): Set scanner_info
	values. Remove get_scanner_name, get_scanner_version,
	get_scanner_description methods.

2014-12-11  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (print_version): Use specific osp server version instead
	of scanner version.

	* ospd/ospd.py (OSPDaemon [__init__]): Initialize server_version.
	(OSPDaemon [get_server_version]): New method.

	* wrappers/ovaldi/ospd-ovaldi.py (OSPDovaldi [__init__]),
	wrappers/w3af/ospd-w3af.py (OSPDw3af [__init__]): Set server_version.

2014-12-09  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (create_args_parser, get_common_args): Add --version
	argument.
	(print_version): New function.
	(main): If --version is specified, call print_version() then exit.

	* ospd/ospd.py (OSPD_VERSION): New variable.
	(OSPDaemon [__init__]): Adjust daemon information.
	(OSPDaemon [get_protocol_version]): New method.

	* wrappers/ovaldi/ospd-ovaldi.py (OSPDOvaldi [get_scanner_version]):
	Adjust version string.

2014-12-08  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	* doc/HTML.xsl, doc/OSP.xml: Fix name of "OSP".

2014-11-27  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/w3af/ospd-w3af.py (OSPDw3af.process_scan_params): Fix
	parameter name. Remove trailling white space.

2014-11-25  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/ospd.py, wrappers/ovaldi/ospd-ovaldi.py,
	  wrappers/w3af/ospd-w3af.py: Remove unused imports, improve logging

2014-11-21  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	Post release version bump.

	* setup.py: Increased version to 1.0+beta5.

2014-11-21  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	Preparing the ospd 1.0+beta4 release.

	* CHANGES: Updated.

2014-11-21  Benot Allard  <benoit.allard@greenbone.net>

	* README: Correct the -d parameter in --log-level

2014-11-21  Benot Allard  <benoit.allard@greenbone.net>

	* wrappers/ovaldi/ospd-ovaldi.py, wrappers/w3af/ospd-w3af.py: Remove
	  crazy PYTHONPATH manipulation. Better use the PYTHONPATH env
	  variable, or a virtualenv for this purpose.

2014-11-21  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/ospd.py: Set default scanner_params.

2014-11-21  Benot Allard  <benoit.allard@greenbone.net>

	* wrappers/ovaldi/ospd-ovaldi.py, wrappers/w3af/ospd-w3af.py,
	  ospd/ospd.py, ospd/misc.py: Small cleanups

2014-11-21  Michael Wiegand <michael.wiegand@greenbone.net>

	* setup.py: Remove stray "," from description.

2014-11-20  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/ospd.py: Fix comments.

2014-11-20  Benot Allard  <benoit.allard@greenbone.net>

	* wrappers/w3af/ospd-w3af.py, wrappers/ovaldi/ospd-ovaldi.py,
	  ospd/ospd.py: Remove xml parsing / generation from child classes.

2014-11-20  Benot Allard  <benoit.allard@greenbone.net>

	* wrappers/w3af/ospd-w3af.py: Make use of OSPDErrors

2014-11-20  Benot Allard  <benoit.allard@greenbone.net>

	* wrappers/ovaldi/ospd-ovaldi.py: Make use of OSPDErrors

2014-11-20  Benot Allard  <benoit.allard@greenbone.net>

	* setup.py: Fix description definition.

2014-11-20  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/misc.py, tests/testArgumentsParser.py: Move file validation to
	  the logparser. Note that this doesn't try to validate the default
	  parameter. This is a regression that is quite handy for test
	  purpose.

2014-11-19  Benot Allard  <benoit.allard@greenbone.net>

	* wrappers/ovaldi/ospd-ovaldi.py, wrappers/w3af/ospd-w3af.py: get rid
	  of the last usages of the intern loggers.

2014-11-19  Benot Allard  <benoit.allard@greenbone.net>

	* tests/testArgumentsParser.py: Take the default value from their
	  source.

2014-11-19  Benot Allard  <benoit.allard@greenbone.net>

	* wrappers/ovaldi/ospd-ovaldi.py, ospd/misc.py: Widen the usage of
	  except ... as ...

2014-11-19  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/ospd.py, ospd/misc.py: Get rid of the internal logging facility

2014-11-19  Benot Allard  <benoit.allard@greenbone.net>

	* wrappers/ovaldi/ospd-ovaldi.py, wrappers/w3af/ospd-w3af.py: Don't
	  protect the external imports, let the exception propagate.

2014-11-19  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/misc.py, tests/testArgumentsParser.py: Replace the --debug
	  option with a --log-level one. Setup the logger accordingly.

2014-11-19  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/misc.py: Fix call to go_to_background (remove logger)

2014-11-19  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/ospd.py: Keep absolute import, restore working situation with
	  older pythons.

2014-11-19  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/ospd.py: Relative import are evil.

2014-11-19  Benot Allard  <benoit.allard@greenbone.net>

	* tests/testArgumentsParser.py, ospd/misc.py: address parsing: Remove
	  dest, set default.

2014-11-18  Benot Allard  <benoit.allard@greenbone.net>

	* tests/testArgumentsParser.py, ospd/misc.py: port parsing: Make use
	  of builtin default / checking functionnalities.

2014-11-18  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/misc.py: (parser) Don't explicitely set default values for
	  dest and type.

2014-11-18  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/misc.py: Don't make the parser return array, we want only one
	  argument anyway.

2014-11-18  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/misc.py: create_args_parser: remove default parameter value.

2014-11-18  Benot Allard  <benoit.allard@greenbone.net>

	* ospd/misc.py: Make use of the python standard logger

2014-11-18  Benot Allard  <benoit.allard@greenbone.net>

	* wrappers/ovaldi/ospd-ovaldi.py, wrappers/w3af/ospd-w3af.py: Remove
	  (now) unused imports, use (previously) unused variables

2014-11-18  Benot Allard  <benoit.allard@greenbone.net>

	* wrappers/ovaldi/ospd-ovaldi.py, wrappers/w3af/ospd-w3af.py,
	  ospd/misc.py: Move the main to the misc module.

2014-11-18  Benot Allard  <benoit.allard@greenbone.net>

	* wrappers/w3af/ospd-w3af.py: Better use python standard logger

2014-11-18  Benot Allard  <benoit.allard@greenbone.net>

	* wrappers/ovaldi/ospd-ovaldi.py: Use the standard logger.

2014-11-18  Benot Allard  <benoit.allard@greenbone.net>

	* wrappers/ovaldi/ospd-ovaldi.py, wrappers/w3af/ospd-w3af.py,
	  ospd/misc.py: Use sys.exit instead of exit from the site module.

2014-11-18  Benot Allard  <benoit.allard@greenbone.net>

	* tests/testOSPDError.py, ospd/ospd.py: Make use of exceptions to
	  throw OSPD errors

2014-11-18  Benot Allard  <benoit.allard@greenbone.net>

	* setup.py, tests/__init__.py: Add framework to host some unit-tests.

2014-11-05  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/w3af/ospd-w3af.py (OSPD_W3AF_PARAMS): Add
	http_response_status scanner parameter.
	(OSPDw3af [get_scan_params]): Get the new scanner parameter.
	(OSPDw3af [exec_scan]): Adjust store_scan_results() method call. Add
	assert.
	(OSPDw3af [store_scan_results]): Add new method parameter to specify
	whether to parse results reports for http response status. Correctly get
	the httperquest element for the request status and headers.

2014-11-05  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/w3af/ospd-w3af.py (OSPD_W3AF_PARAMS): Add http_request_status
	and http_request_headers scanner parameters.
	(OSPDw3af [get_scan_params]): Get the new scanner parameters.
	(OSPDw3af [store_scan_results]): Add new method parameters to specify
	whether to parse results reports for http request status and request
	headers.
	(OSPDw3af [exec_scan]): Adjust store_scan_results() method call. Add
	asserts.

2014-11-04  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon [get_scan_param]): New method.

	* wrappers/w3af/ospd-w3af.py (OSPDw3af [get_scan_params]): New method.
	(OSPDw3af [handle_start_scan_command]): Use new method to get dict of
	scanner parameters.

2014-11-04  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/w3af/ospd-w3af.py (OSPDw3af [store_scan_results]): Strip off
	the vuln and info's http request internal ID as it is meaningless.

2014-11-03  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon [new_client_stream]): Handle socket related
	exceptions when doing SSL/TLS handshake.
	(OSPDaemon [handle_client_stream]): Handle different exceptions when
	reading from ssl wrapped socket.

2014-10-31  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (ScanCollection [create_scan]): Initalize exec_thread's
	value in scan_info.
	(ScanCollection [get_thread, set_thread]): New class methods.

	* ospd/ospd.py (OSPDaemon [start_scan]): Use threading module. Set the
	scan's executing thread.
	(OSPDaemon [check_scan_thread, get_scan_thread]): New methods.
	(OSPDaemon [handle_get_scans_command, handle_delete_scan_command]):
	Call check_scan_thread() method adequately.

2014-10-30  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/ovaldi/ospd-ovaldi.py (OSPdovaldi [exec_scan]): Don't provide
	timeout value for ssh exec_cmd() call, as it is already set on ssh
	connect().

2014-10-29  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/ovaldi/ospd-ovaldi.py (OSPDOvaldi [exec_scan]): Use correct
	error string in case of authentication failure error, and correctly
	clean-up local directory on other errors.

2014-10-28  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/w3af/ospd-w3af.py (OSPDw3af [check]): Improve check for
	ability to launch w3af_console correctly.

2014-10-28  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	* INSTALL: Fix scanner type.

	* README: Fix hostname.

2014-10-15  Michael Wiegand <michael.wiegand@greenbone.net>

	Post release version bump.

	* setup.py: Increased version to 1.0+beta4.

2014-10-15  Michael Wiegand <michael.wiegand@greenbone.net>

	Preparing the ospd 1.0+beta3 release.

	* CHANGES: Updated.

2014-10-01  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* INSTALL: Add section on generating OSP documentation.

	* ospd/doc/generate, ospd/doc/HTML.xsl, ospd/doc/OSP.xml: Move files to
	doc/ directory.

2014-09-30  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/doc/generate, ospd/doc/OSP.xml, ospd/doc/HTML.xsl: New
	OSP documentation files.

2014-09-29  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/w3af/ospd-w3af.py: Check for profile name without importing
	w3af.

2014-09-26  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (get_commands_table): Document help command's format
	attribute.
	(OSPDaemon [handle_help_command]): Handle text format type.

2014-09-25  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (ScanCollection [add_alarm, add_log, add_error): Make
	result entries as dictionnaries instead of tuples. Add result severity.

	* ospd/ospd.py (get_result_xml): Add result severity. Adjust for result
	entries being dictionnaries.
	(OSPDaemon [add_scan_alarm]): Add severity method parameter.

	* wrappers/w3af/ospd-w3af.py (OSPDw3af [store_scan_results]): Extract
	vulnerabilities severity values.

2014-09-24  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (go_to_background): Call exit() directly.

	* ospd/ospd.py (OSPDaemon [set_command_elements]): Rename to
	init_scanner_params(). Adjust method accordingly.

	* wrappers/w3af/ospd-w3af.py (OSPDOvaldi),
	wrappers/ovaldi/ospd-ovaldi.py (OSPDw3af): Call init_scanner_params()
	method to setup scanner specific parameters.

2014-09-24  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (go_to_background): New function.
	(create_args_parser, get_common_args): Add --background option.

	* wrappers/w3af/ospd-w3af.py, wrappers/ovaldi/ospd-ovaldi.py: Check for
	and handle --background option.

2014-09-23  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon [get_result_xml, simple_response_str]): Move
	methods out to be independant functions. Adjust calls accordingly.

	* wrappers/ovaldi/ospd-ovaldi.py, wrappers/w3af/ospd-w3af.py: Adjust
	simple_response_str() function calls.

2014-09-23  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (SyslogLogger): Add class doc string.

	* ospd/ospd.py (OSPDaemon [get_commands_table]): Move out method to be a
	function.
	(OSPDaemon): Initialize class variable.

	* wrappers/ovaldi/ospd-ovaldi.py (OSPDOvaldi [get_definition_result]):
	Move out method to be a function.

	* wrappers/w3af/ospd-w3af.py: Add module doc string, add exceptions
	types, refactor code and fix code style for constant variables.
	(OSPDw3af): Move out get_w3af_version() method to be a function, remove
	unused variable and fix code style.
	(OSPDw3af [handle_start_scan_command]): Add exception type.

2014-09-23  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/w3af/ospd-w3af.py (ospd_w3af_params): Add use_https scanner
	parameter.
	(OSPDw3af [handle_start_scan_command, create_w3af_script]): Handle
	use_https scanner parameter and set target url accordingly.
	(OSPDw3af [exec_scan]): Add scan options asserts.

2014-09-23  Michael Wiegand <michael.wiegand@greenbone.net>

	Post release version bump.

	* setup.py: Increased version to 1.0+beta3.

2014-09-23  Michael Wiegand <michael.wiegand@greenbone.net>

	Preparing the ospd 1.0+beta2 release.

	* CHANGES: Updated.

2014-09-22  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/w3af/ospd-w3af.py: Output help message when not able to
	import w3af.
	(OSPDw3af [handle_start_scan_command, create_w3af_script]): Check
	profile name dynamically, instead of using a hard-coded list.

2014-09-22  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon [get_result_xml]): Escape xml result text.

	* wrappers/w3af/ospd-w3af.py (ospd_w3af_params): Add target_port scanner
	parameter.
	(OSPDw3af [handle_start_scan_command, create_w3af_script]): Handle
	target port scanner parameter accordingly.

2014-09-19  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py: Replace always false assertions with NotImplementedError
	exception.

2014-09-19  Hani Benhabiles <hani.benhabiles@greenbone.net>

	Add --syslog option.

	* ospd/misc.py (OSPLogger [print_message]): Make method private.
	(SyslogLogger): New class.
	(create_args_parser): Add --syslog option.

	* ospd/ospd.py (OSPDaemon): Remove debug argument.
	(OSPDaemon [set_logger]): New method.

	* wrappers/ovaldi/ospd-ovaldi.py: Adjust OSPDOvaldi initialization and
	use syslog logger accordingly.
	(OSPDOvaldi):  Remove debug argument.

	* wrappers/w3af/ospd-w3af.py: Adjust OSPDw3af initialization and
	use syslog logger accordingly.
	(OSPDw3af):  Remove debug argument.

2014-09-18  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon [get_scanner_description]): Add assert
	failure when not implemented by subclass.

	* wrappers/ovaldi/ospd-ovaldi.py (OSPDOvaldi),
	wrappers/w3af/ospd-w3af.py (OSPw3af): Implement get_scanner_description
	method. Remove useless class variables.

2014-09-17  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/w3af/ospd-w3af.py (OSPDw3af [store_scan_results]): Add
	vulnerabilities and information entries names to the scan report.

2014-09-16  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/w3af/ospd-w3af.py (OSPDw3af [exec_scan]): Don't remove output
	file in debugging mode.

2014-09-15  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon [__init__]): Remove port and address as
	initialization parameters. Regroup class members adequately.
	(OSPDaemon [handle_start_scan_command, exec_scan]): Assert method
	parameters.
	(OSPDaemon [get_daemon_name, get_daemon_version])
	([get_scanner_description]): Adjust for class members changes.
	(OSPDaemon [bind_socket, start_daemon, run]): Add address and port
	arguments.
	(OSPDaemon [new_client_stream]): Add sock argument.

	* wrappers/ovaldi/ospd-ovaldi.py, wrappers/w3af/ospd-w3af.py (OSPw3af):
	Adjust for OSPDaemon class changes.

2014-09-08  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon.get_scanner_param_default): New method.
	(OSPDaemon.get_scanner_params_xml): Add param value to the params xml.

	* wrappers/ovaldi/ospd-ovaldi.py (OSPD_OVALDI_PARAMS): Add parameters
	default values.
	(OSPDOvaldi): Use params default values instead of hardcoded ones.

	* wrappers/w3af/ospd-w3af.py (ospd_w3af_params): Add default values.
	(OSPDw3af):  Use params default values instead of hardcoded ones.

2014-09-05  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (create_args_parser, get_common_args): Remove timeout cli
	argument.

	* ospd/ospd.py (OSPDaemon): Remove timeout argument.

	* wrappers/ovaldi/ospd-ovaldi.py (OSPD_OVALDI_PARAMS): Add ssh_timeout
	scanner parameter.
	(OSPOvaldi): Remove timeout argument. Use ssh_timeout scanner parameter
	instead.

	* wrappers/w3af/ospd-w3af.py (ospd_w3af_params): Add w3af_timeout
	scanner parameter.
	(OSPDw3af): Remote timeout argument. Use w3af_timeout scanner parameter
	instead.

2014-09-04  Michael Wiegand <michael.wiegand@greenbone.net>

	* INSTALL: Fix typo.

2014-09-03  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/ovaldi/ospd-ovaldi.py (OSPD_OVALDI_PARAMS): Change port type
	to integer. Change definitions_file type to file. Improve description.

2014-09-02  Michael Wiegand <michael.wiegand@greenbone.net>

	* setup.py, ospd/misc.py, ospd/ospd.py,
	wrappers/ovaldi/ospd-ovaldi.py, wrappers/w3af/ospd-w3af.py: Ensure the
	GPLv2+ license notice uses the paragraph suggested by the Free
	Software Foundation.

2014-08-30  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	Post-release version bump.

	* setup.py: Increased version to 1.0+beta2.

2014-08-30  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	Preparing the ospd 1.0+beta1 release.

	* ospd/ospd.py (OSP_VERSION): Increased protocol version to 0.1.0.

	* setup.py: Increased version to 1.0+beta1. Drop Python 2.6 as a
	supported version.

	* INSTALL: Added python minimum version 2.7.

	* CHANGES: New.

	* README: Cleaned and updated.

	* wrappers/ovaldi/ospd-ovaldi.py (OSPDOvaldi.__init__): Increased
	version numnber to 1.0+beta1.

	* wrappers/w3af/ospd-w3af.py (OSPDw3af.__init__): Increased
	version numnber to 1.0+beta1.

2014-08-27  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/ovaldi/ospd-ovaldi.py: Add module docstring, fix code
	style and remove unused variables. Remove outdated todo.

	* ospd/ospd.py (OSPDaemon.handle_start_scan_command)
	(OSPDaemon.exec_scan): Fix function arguments of unimplemented base
	methods.

2014-08-27  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py: Add module docstring.
	(OSPDaemon): Initialize socket variable in constructor.  Fix code
	indentation and style. Remove unused variables and remove unused
	function arguments.
	(OSPDaemon.handle_get_scanner_details_command): Add method docstring.

2014-08-20  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py: Add module docstring and fix various warnings and errors
	reported by pylint.

	* wrappers/ovaldi/ospd-ovaldi.py, wrappers/w3af/ospd-w3af.py: Adjust
	get_common_args() calls.

2014-08-15  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (ResultType): Adjust result types to match the used ones
	by OpenVAS Manager.

2014-08-12  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon.get_scanner_params_xml): Adjust to get
	parameter identifier from the key value.
	(OSPDaemon.get_help_text()): Improve formatting. Call elements_as_text
	to handle composed values.
	(OSPDaemon.elements_as_text): New method.

	* wrappers/ovaldi/ospd-ovaldi.py (ospd_ovaldi_params): Use parameters
	id's as dictionnary's keys.
	(OSPDOvaldi.__init__): Use scanner_params values when setting start_scan
	command's elements.

	* wrappers/w3af/ospd-w3af.py (ospd_w3af_description, ospd_w3af_params):
	New variable.
	(OSPDw3af.__init__): Set scanner description and parameters adequately.

2014-08-12  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon.handle_get_scans_command): Adjust code to
	correctly close get_scans_response tag.

2014-08-11  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospdy.py (OSPDaemon.__init__): Set description and scanner_params
	default values.
	(OSPDaemon.get_commands_table): Add get_scanner_details command.
	(OSPDaemon.get_scanner_description, OSPDaemon.get_scanner_params_xml)
	(OSPDaemon.handle_get_scanner_details_command): New methods.
	(OSPDaemon.handle_command): Handle get_scanner_details command.

	* wrappers/ovaldi/ospd-ovaldi.py (ospd_ovaldi_description)
	(ospd_ovaldi_params): New variables.
	(OSPDOvaldi.__init__): Set daemon description and scanner parameters.

2014-08-11  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon.handle_get_scans_command)
	(OSPDaemon.handle_help_command, OSPDaemon.handle_delete_scan_command)
	(OSPDaemon.handle_command, OSPDaemon.handle_get_version): Use
	simple_response_str method for consistency. Fix and improve various
	responses.
	(OSPDaemon.create_response_string): Rename method to get_xml_str().
	(OSPDaemon.get_scan_xml, OSPDaemon.handle_get_version): Call
	get_xml_str() method adequately.

	* wrappers/ovaldi/ospd-ovaldi.py (OSPDOvaldi.exec_scan),
	wrappers/w3af/ospd-w3af.py (OSPDw3af.exec_scan): Use new method.

2014-08-11  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon.start_daemon): Return True or False for
	consistency.
	(OSPDaemon.simple_response_str): New method.
	(OSPDaemon.run): Adjust start_daemon() call and return value.

	* wrappers/ovaldi/ospd-ovaldi.py (OSPDOvaldi.handle_start_scan_command):
	Fetch the scan parameters from scanner_params element. Use new method
	for consistent response strings. Decode base64 definitions file to catch
	errors earlier.
	(OSPDOvaldi.exec_scan): Don't decode definitions content as it is
	already done.

	* wrappers/w3af/ospd-w3af.py (OSPDOvaldi.handle_start_scan_command):
	Fetch scan profile from scanner_params element. Use new method for
	response string consistency.

2014-08-08  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/ovaldi/ospd-ovaldi.py (OSPDOvaldi.parse_oval_results): Only
	add definitions evaluated as true as scan results. Don't add false,
	error, unknown and not applicable definitions as they are only in the
	ovaldi.log.

2014-08-08  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/ovaldi/ospd-ovaldi.py (OSPDOvaldi.exec_scan): Use specified
	time-out value when connecting to the target.

2014-08-07  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/ovaldi/ospd-ovaldi.py (OSPDOvaldi.parse_results_xml)
	(OSPDOvaldi.parse_oval_syschar_xml): Handle results and syschar reports
	generated by some ovaldi versions where generator child element's tag
	isn't in the oval namespace.

2014-08-01  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/ovaldi/ospd-ovaldi.py (OSPDOvaldi.check_ovaldi): New method.
	(OSPDOvaldi.exec_scan): Call new method to check for ovaldi binary on
	target and the oval schema folder presence. Adjust command to
	explicitly specify the schema folder.

2014-08-01  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (OSPLogger.get_level): New method.

	* wrappers/ovaldi/ospd-ovaldi.py (OSPDOvaldi.exec_scan): Use sftp
	connection to create temporary directory and report error accordingly.
	Add debug message for ovaldi command run on target. Do not remove
	directory on target host when debugging is set.

2014-08-01  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/ovaldi/ospd-ovaldi.py (OSPDOvaldi.exec_scan): Handle case
	when sftp to the target is not possible and report the error correctly.

2014-07-31  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	* setup.py: Added paramiko to install_requires.

	* INSTALL: Added hint on automatic download/install when using setup.py.

2014-07-31  Hani Benhabiles <hani.benhabiles@greenbone.net>

	Remove unused remote-ovaldi.sh and related files.

	* INSTALL: Add python-paramiko dependency.

	* README: Adjust documentation for remote-ovaldi.sh removal.

	* setup.py: Don't install removed files.

	* wrappers/ovaldi/doc/remote-ovaldi-doc.txt,
	wrappers/ovaldi/remote-ovaldi-setup.sh,
	wrappers/ovaldi/remote-ovaldi.sh: Remove files.

	* wrappers/ovaldi/ospd-ovaldi.py: Remove --remote-ovaldi cli argument
	handling.
	(OSPDOvaldi.__init__): Remove rovaldi_path parameter.
	(OSPDOvaldi.get_scanner_name, OSPDOvaldi.get_scanner_version): Adjust
	for scan method change.
	(OSPDOvaldi.exec_scan): Use command -v which is more POSIX-compliant
	instead of type.

2014-07-31  Hani Benhabiles <hani.benhabiles@greenbone.net>

	Replace remote-ovaldi.sh wrapping with code in ospd-ovaldi.py to check
	for and run ovaldi over SSH directly.

	* wrappers/ovaldi/ospd-ovaldi.py: Import paramiko. Don't import
	psexpect.
	(OSPDOvaldi.check): Remove check for remote-ovaldi.sh.
	(OSPDOvaldi.finish_scan_with_err): New class method.
	(OSPDOvaldi.exec_scan): Connect to the target with SSH instead of
	executing remote-ovaldi.sh and parsing the output. Check for ovaldi's
	presence on the target, create the temporary directory, copy the
	definitions files, run the scan, get the results files and cleanup.
	Improve handling of various errors.
	(OSPDOvaldi.parse_oval_syschar_xml, OSPDOvaldi.parse_results_xml)
	(OSPDOvaldi.parse_ovaldi_log): Take file path as method argument.

2014-07-30  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon): Rename delete_scan id attribute to scan_id
	for consistency.

2014-07-29  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* INSTALL, README: Update documentation.

2014-07-25  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	* INSTALL: Added sections about certificate creation and about
	registering a OSP daemon at OpenVAS Manager.

	* README: Removed text abuot certificates (now in INSTALL) and
	apply some slight structural improvements.

2014-07-23  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	First approach for a config/install methodology.

	* setup.py: New. Not optimal yet, needs further attention to
	fully suffice LFH, the python way and other deployment aspects.

	* INSTALL: Added sections on how to install ospd and ho to create
	a source package.

	* README: The daemons can now be called directly if installed
	into a path-aware directory.

2014-07-23  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospdy.py (OSPDaemon.handle_client_stream): Fix error when client
	closes the socket before sending any data.

2014-06-03  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* README: Update documentation. oval definitions are now part of the
	scan config and certs are used for authentication. Update commands
	output and command-line examples.

2014-05-30  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/ovaldi/ospd-ovaldi.py (OSPDOvaldi): Handle ssh permissions
	denied case and report as scan error to client.

2014-05-30  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/ovaldi/ospd-ovaldi.py (OSPDOvaldi): Change definitions option
	to definitions_file.

2014-05-23  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py, wrappers/ovaldi/ospd-ovaldi.py,
	wrappers/w3af/ospd-w3af.py, ospd/ospd.py: Replace Alert with Alarm for
	all class methods, variables, strings and comments to match the change
	in Manager.

2014-05-20  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospdy.py (OSPDaemon.get_commands_table): Document scan_id and
	details attributes for get_scan command.
	(OSPDaemon.handle_get_scans_command): Handle details attribute.
	(OSPDaemon.get_scan_xml): Add detailed function argument, don't send
	results when set to False.

	* wrappers/ovaldi/ospd-ovaldi.py (OSPDOvaldi.parse_oval_syschar_xml)
	(OSPDOvaldi.parse_results_xml, OSPDOvaldi.parse_ovaldi_log): Only parse
	file content when no exception was raised.

2014-05-19  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon.handle_get_scans_command): Support scan_id
	attribute usage for get_scans command to get one specific scan report.
	(OSPDaemon.get_scan_xml): Don't send back options content as client
	already has those and they may contain sensitive information like
	passwords or have huge size like ovaldi definitions file.

2014-04-17  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon.handle_client_stream): Read all the client
	input before trying to handle it, in order to better handle commands
	with large content.

	* ovaldi/ospd-ovaldi.py (OSPDOvaldi.__init__): Remove defsfile argument.
	Add definitions element to start_scan command.
	(OSPDOvaldi.handle_start_scan_command, OSPDOvaldi.exec_scan): Use
	definitions file from client input instead of local file from path in
	options.
	(__main__): Remove --defs-file cli option.

	* w3af/ospd-w3af.py (OSPDw3af.create_w3af_script): Delete duplicate file
	close.

2014-02-24  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/ovaldi/ospd-ovaldi.py (OSPDOvaldi.exec_scan): Correct comment
	and fix function call.
	(OSPDOvaldi.parse_result_xml): Rename to parse_results_xml. Fix path to
	results file. Parse results element and call parse_oval_results instead
	of parse_oval_definitions.
	(OSPDOvaldi.parse_oval_definitions): Rename to parse_oval_results. Add
	results argument. Add definitions results as scan results values instead
	of definition titles.
	(OSPDOvaldi.get_definition_result): New function.

	* wrappers/ovaldi/remote-ovaldi.sh: Fix results file name to better
	match default value.

2014-02-21  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/oaldi/ospd-ovaldi.py (OSPOvaldi.exec_scan): Add debug
	messages for various steps of the scan.

2014-02-20  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/ovaldi/ospd-ovaldi.py (OSPOvaldi.parse_oval_syschar_xml):
	Parse system characteristics generator information.
	(OSPDOvaldi.parse_result_xml): Extract individual results from the file
	content and adequately add their values as scan results.
	(OSPDOvaldi.parse_oval_definitions): New function.

2014-02-20  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py (OSPDaemon.exec_scanner): Rename method to exec_scan.
	(OSPDaemon.finish_scan): New method.
	(OSPDaemon.start_scan): Add debug message for scan start.
	(OSPDaemon.handle_timeout): Call finish_scan method.

	* wrappers/ovaldi/ospd-ovaldi.py (OSPDOvaldi.exec_scanner): Rename to
	exec_scan. Adjust log messages and call finish_scan. Rename
	handle_timeout calls.
	(OSPDOvaldi.parse_oval_syschar_xml): Handle IOError when trying to
	read oval_syschar.xml file.

	* wrappers/w3af/ospd-w3af.py (OSPDw3af.exec_scanner): Rename to
	exec_scan. Write scans output file in host temporary directory. Remove
	extraneous debug messages. Finish with finish_scan method.

2014-02-19  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/ovaldi/ospd-ovaldi.py: Improt cElementTree.
	(OSPDOvaldi.__init__): Use cafile parameter when initializing the parent
	class.
	(OSPDOvaldi.exec_scanner): Adjust add_scan_error method call.
	(OSPDOvaldi.parse_ovaldi_log,parse_result_xml,parse_oval_syschar_xml):
	New class methods.

	* ospd/misc.py (ScanCollection.add_alert,add_log,add_error): Add name
	argument. Rename msg argument to value.

	* ospd/ospd.py: Import cElementTree when available.
	(OSPDaemon.handle_timeout): Adjust add_scan_error method call.
	(OSPDaemon.get_scan_results_xml): Call get_result_xml method.
	(OSPDaemon.get_result_xml): New method.
	(OSPDaemon.add_scan_log,add_scan_alert,add_scan_error): Add name
	argument. Rename msg argument to value.

	* wrappers/w3af/ospd-w3af.py: Remove unneeded import.
	(OSPDw3af.store_scan_results): Adjust methods calls.

2014-02-18  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (ScanCollection.set_progress): Set start_time and
	end_time adequately.
	(ScanCollection.get_start_time, ScanCollection.get_end_time): New
	functions.

	* ospd/ospd.py (OSPDaemon.get_scan_xml): Print start_time and end_time
	scan element attributes.
	(OSPDaemon.get_scan_start_time, OSPDaemon.get_scan_end_time): New
	functions.

2014-02-18  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/misc.py (result_type): Delete instance.
	(ResultType.get_str): New class method.
	(ScanCollection): Use ResultType class instead of removed instance.

	* ospd/ospd.py: Import ResultType from misc.
	(OSPDaemon.new_client_stream): Add debug message.
	(OSPDaemon.get_scan_results_xml): Print result type's string value.

2014-02-18  Hani Benhabiles <hani.benhabiles@greenbone.net>

	Add authentication with client certificates.

	* ospd/misc.py: Add default values variables for various options.
	(create_args_parser): Add --ca-file option. Update documentation.
	Refactor to use default values variables.
	(get_common_args): Parse ca-file option. Use default value variables.
	Update certs files documentation to point to using openvas-mkcert to
	generate server certificates instead.

	* ospd/ospd.py (OSPDaemon.__init__): Add cafile argument.
	(OSPDaemon.new_client_stream): Force usage of client certificates to
	authenticate. Print failure error accordingly.
	(OSPDaemon.handle_command): Adjust erroneous command debug message. Do
	not handle authenticate command as authentication is now done with
	client certificates.

	* wrappers/ovaldi/ospd-ovaldi.py (OSPDOvaldi.__init__): Add cafile
	argument.
	(main): Style upate.

	* wrappers/w3af/ospd-w3af.py (OSPDw3af.__init__): Add cafile argument.
	(main): Style upate.

2014-02-12  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospy.py (OSPDaemon.handle_client_stream): Handle reading from
	socket exception when client abruptly closes the socket.
	(OSPDaemon.close_client_stream): Handle socket.error exception when
	shutting down socket.
	(OSPDaemon.run): Adjust calls to handle_client_stream and
	close_client_stream.

2014-01-10  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* wrappers/ovaldi/ospd-ovaldi.py, wrappers/w3af/ospd-w3af.py: New.

	* ospd/misc.py (create_args_parser, get_common_args): Adjust default
	scanner timeout value.

2014-01-10  Hani Benhabiles <hani.benhabiles@greenbone.net>

	* ospd/ospd.py, ospd/misc.py: New.

2014-01-10  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	* wrappers/ovaldi/doc/, wrappers/ovaldi/doc/remote-ovaldi-doc.txt,
	wrappers/ovaldi/remote-ovaldi-setup.sh,
	wrappers/ovaldi/remote-ovaldi.sh: New. Moved here from
	tools/remote-ovaldi.

2014-01-10  Jan-Oliver Wagner <jan-oliver.wagner@greenbone.net>

	Starting module "ospd".

	* COPYING, README, INSTALL, ospd/, ospd/__init__.py, wrappers/,
	wrappers/ovaldi/, wrappers/ovaldi/sampledata/,
	wrappers/ovaldi/sampledata/defs.xml, wrappers/w3af/: New.
