[Oval-commits] r380 - in trunk/oval-infrastructure: . debian.server docs etc src src/oval
Pavel Vinogradov
blaze-guest at alioth.debian.org
Tue Sep 23 17:38:19 UTC 2008
Author: blaze-guest
Date: 2008-09-23 17:38:18 +0000 (Tue, 23 Sep 2008)
New Revision: 380
Added:
trunk/oval-infrastructure/COPYING
trunk/oval-infrastructure/debian.server/
trunk/oval-infrastructure/docs/Dsa2Oval.README
trunk/oval-infrastructure/docs/Dsa2Oval.TODO
trunk/oval-infrastructure/docs/OvalMonitor.BUGS
trunk/oval-infrastructure/docs/OvalServer.BUGS
trunk/oval-infrastructure/docs/OvalServer.README
trunk/oval-infrastructure/docs/OvalServer.TODO
trunk/oval-infrastructure/etc/
trunk/oval-infrastructure/etc/agent.conf
trunk/oval-infrastructure/etc/server.conf
trunk/oval-infrastructure/src/daemon.py
trunk/oval-infrastructure/src/dsa2oval.py
trunk/oval-infrastructure/src/oval-monitor.py
trunk/oval-infrastructure/src/oval-server.py
trunk/oval-infrastructure/src/oval/
trunk/oval-infrastructure/src/setup.py
Removed:
trunk/oval-infrastructure/agent.conf
Log:
Merge oval-server
Copied: trunk/oval-infrastructure/COPYING (from rev 379, trunk/oval-server/COPYING)
===================================================================
--- trunk/oval-infrastructure/COPYING (rev 0)
+++ trunk/oval-infrastructure/COPYING 2008-09-23 17:38:18 UTC (rev 380)
@@ -0,0 +1,504 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
+
+
Property changes on: trunk/oval-infrastructure/COPYING
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: trunk/oval-infrastructure/agent.conf
===================================================================
--- trunk/oval-infrastructure/agent.conf 2008-09-23 17:26:57 UTC (rev 379)
+++ trunk/oval-infrastructure/agent.conf 2008-09-23 17:38:18 UTC (rev 380)
@@ -1,16 +0,0 @@
-[server]
-baseurl = /
-check_interval = 1
-server = 127.0.0.1
-port = 8989
-descr = laptop.home.nixdev.net
-
-[general]
-# Directory where log files are kept
-log_dir = /var/log/oval
-log_file = oval-agent.log
-#log_level = CRITICAL | ERROR | WARNING (default) | INFO | DEBUG | NOTSET
-log_level = DEBUG
-# This is the working directory where definitions are downloaded
-workdir = /var/cache/oval-agent/definitions
-
Copied: trunk/oval-infrastructure/debian.server (from rev 379, trunk/oval-server/debian)
Property changes on: trunk/oval-infrastructure/debian.server
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/oval-infrastructure/docs/Dsa2Oval.README (from rev 379, trunk/oval-server/Dsa2Oval.README)
===================================================================
--- trunk/oval-infrastructure/docs/Dsa2Oval.README (rev 0)
+++ trunk/oval-infrastructure/docs/Dsa2Oval.README 2008-09-23 17:38:18 UTC (rev 380)
@@ -0,0 +1,41 @@
+Package: dsa2oval
+Version: 0.42 (first beta)
+License: GNU GPL2
+Authors: (c) 2007 Pavel Vinogradov <Pavel.Vinogradov _ nixdev.net>
+ (c) 2004 Javier Fernandez-Sanguino
+Summary: Convers DSA repository into OVAL definitions XML
+
+ Script dsa2oval.py used to generate OVAL definitions queries from
+repository of DSA. It based on perl script parse-wml-oval.pl by
+Javier Fernandez-Sanguino but improved in many points.
+ This is a first beta release therefore script need more optimizations
+and code cleanup. At the current stage it may be used to generate
+OVAL definitions from DSA repository (full or partial). Currently OVAL
+generic interpreter not support DPKG based distributives.
+
+Dependencies:
+ Python 2.4
+ python-libxml2
+ python-xml
+
+Package content:
+ Package contain two additional modules:
+ parser: Contain functions for parsing DSA data and wml files in
+dictionary objects
+ definition: Contain function for generate and optimize OVAL
+definitions tree.
+
+ dsa2oval.py - main script, that parsed specified directories
+and print generated XML on stdout
+
+Usage:
+ dsa2oval.py accept some command-line options:
+-v verbose mode. In this mode logging module print all WARNINGS to stderr.
+-d specify directory of DSA repository storage
+-f specify DSA file to parse
+-h print usage information
+
+Limitation of 0.42 release:
+ By default script use only two level of recursion in DSA storage. This options not
+controled by command-line switch now.
+ Resulted XML passed validation by ovaldi schema, but have some weakness in formating.
Property changes on: trunk/oval-infrastructure/docs/Dsa2Oval.README
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/oval-infrastructure/docs/Dsa2Oval.TODO (from rev 379, trunk/oval-server/Dsa2Oval.TODO)
===================================================================
--- trunk/oval-infrastructure/docs/Dsa2Oval.TODO (rev 0)
+++ trunk/oval-infrastructure/docs/Dsa2Oval.TODO 2008-09-23 17:38:18 UTC (rev 380)
@@ -0,0 +1,5 @@
+oval/dsa2ova/definition/generator.py
+ Update uname architecture mappings
+
+oval/dsa2oval/parser/wml.py
+ Save html tags instead of omit them
Property changes on: trunk/oval-infrastructure/docs/Dsa2Oval.TODO
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/oval-infrastructure/docs/OvalMonitor.BUGS (from rev 379, trunk/oval-server/OvalMonitor.BUGS)
===================================================================
--- trunk/oval-infrastructure/docs/OvalMonitor.BUGS (rev 0)
+++ trunk/oval-infrastructure/docs/OvalMonitor.BUGS 2008-09-23 17:38:18 UTC (rev 380)
@@ -0,0 +1 @@
+Currently None
Property changes on: trunk/oval-infrastructure/docs/OvalMonitor.BUGS
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/oval-infrastructure/docs/OvalServer.BUGS (from rev 379, trunk/oval-server/OvalServer.BUGS)
===================================================================
--- trunk/oval-infrastructure/docs/OvalServer.BUGS (rev 0)
+++ trunk/oval-infrastructure/docs/OvalServer.BUGS 2008-09-23 17:38:18 UTC (rev 380)
@@ -0,0 +1,6 @@
+- CTRL+C don't kill server
+ Server will stop only after client request. Because HttpThread
+ locked in handle_response() and can't be terminated until release lock.
+- Set the umask or log permissions properly. This is not correct:
+ -rwxrwxr-x 1 root oval 1241 2007-09-05 00:42 oval-server.log
+
Property changes on: trunk/oval-infrastructure/docs/OvalServer.BUGS
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/oval-infrastructure/docs/OvalServer.README (from rev 379, trunk/oval-server/OvalServer.README)
===================================================================
--- trunk/oval-infrastructure/docs/OvalServer.README (rev 0)
+++ trunk/oval-infrastructure/docs/OvalServer.README 2008-09-23 17:38:18 UTC (rev 380)
@@ -0,0 +1 @@
+Currently none
Property changes on: trunk/oval-infrastructure/docs/OvalServer.README
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/oval-infrastructure/docs/OvalServer.TODO (from rev 379, trunk/oval-server/OvalServer.TODO)
===================================================================
--- trunk/oval-infrastructure/docs/OvalServer.TODO (rev 0)
+++ trunk/oval-infrastructure/docs/OvalServer.TODO 2008-09-23 17:38:18 UTC (rev 380)
@@ -0,0 +1,6 @@
+dsaSync:
+ Implement mail sync
+ Implement rss sync
+Filtering by release
+
+the server/agent should either warn about the cfg directories missing or should create them
Property changes on: trunk/oval-infrastructure/docs/OvalServer.TODO
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/oval-infrastructure/etc/agent.conf (from rev 379, trunk/oval-infrastructure/agent.conf)
===================================================================
--- trunk/oval-infrastructure/etc/agent.conf (rev 0)
+++ trunk/oval-infrastructure/etc/agent.conf 2008-09-23 17:38:18 UTC (rev 380)
@@ -0,0 +1,16 @@
+[server]
+baseurl = /
+check_interval = 1
+server = 127.0.0.1
+port = 8989
+descr = laptop.home.nixdev.net
+
+[general]
+# Directory where log files are kept
+log_dir = /var/log/oval
+log_file = oval-agent.log
+#log_level = CRITICAL | ERROR | WARNING (default) | INFO | DEBUG | NOTSET
+log_level = DEBUG
+# This is the working directory where definitions are downloaded
+workdir = /var/cache/oval-agent/definitions
+
Copied: trunk/oval-infrastructure/etc/server.conf (from rev 379, trunk/oval-server/server.conf)
===================================================================
--- trunk/oval-infrastructure/etc/server.conf (rev 0)
+++ trunk/oval-infrastructure/etc/server.conf 2008-09-23 17:38:18 UTC (rev 380)
@@ -0,0 +1,39 @@
+[general]
+log_dir = /var/log/oval/
+log_file = oval-server.log
+#log_level = CRITICAL | ERROR | WARNING (default) | INFO | DEBUG | NOTSET
+log_level = INFO
+dsa_storage = /var/lib/oval-server/dsa
+db = /var/lib/oval-server/oval-server.db
+
+[daemon]
+uid =
+gid =
+pidfile = ./daemon.pid
+logfile = ./daemon.log
+loglevel = debug
+
+[server]
+type = http
+ip = 127.0.0.1
+port = 8989
+workdir = /var/cache/oval-server/definitions
+
+[source]
+type = local
+name = "Local OVAL definitions source"
+source = /var/cache/oval-server/repos
+update_interval = 1
+
+#type = http
+#name = "OVAL http repository"
+#source = /~blaze/debian/dsa/
+#server = server
+#update_interval = 1
+
+#type = ftp
+#name = "OVAL ftp repository"
+#source = debian/dsa
+#server = server
+#update_interval = 1
+
Property changes on: trunk/oval-infrastructure/etc/server.conf
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/oval-infrastructure/src/daemon.py (from rev 379, trunk/oval-server/daemon.py)
===================================================================
--- trunk/oval-infrastructure/src/daemon.py (rev 0)
+++ trunk/oval-infrastructure/src/daemon.py 2008-09-23 17:38:18 UTC (rev 380)
@@ -0,0 +1,387 @@
+"""Daemon base class
+
+Provides a framework for daemonizing a process. Features:
+
+ - reads the command line
+
+ - reads a configuration file
+
+ - configures logging
+
+ - calls root-level setup code
+
+ - drops privileges
+
+ - calls user-level setup code
+
+ - detaches from the controlling terminal
+
+ - checks and writes a pidfile
+
+
+Example daemon:
+
+import daemon
+import logging
+import time
+
+class HelloDaemon(daemon.Daemon):
+ default_conf = '/etc/hellodaemon.conf'
+ section = 'hello'
+
+ def run(self):
+ while True:
+ logging.info('The daemon says hello')
+ time.sleep(1)
+
+if __name__ == '__main__':
+ HelloDaemon().main()
+
+
+Example hellodaemon.conf:
+
+[hello]
+uid =
+gid =
+pidfile = ./hellodaemon.pid
+logfile = ./hellodaemon.log
+loglevel = info
+
+"""
+
+import ConfigParser
+import errno
+import grp
+import logging
+import optparse
+import os
+import pwd
+import signal
+import sys
+import time
+
+
+class Daemon(object):
+ """Daemon base class"""
+
+ default_conf = '' # override this
+ section = 'daemon' # override this
+
+ def setup_root(self):
+ """Override to perform setup tasks with root privileges.
+
+ When this is called, logging has been initialized, but the
+ terminal has not been detached and the pid of the long-running
+ process is not yet known.
+ """
+
+ def setup_user(self):
+ """Override to perform setup tasks with user privileges.
+
+ Like setup_root, the terminal is still attached and the pid is
+ temporary. However, the process has dropped root privileges.
+ """
+
+ def run(self):
+ """Override.
+
+ The terminal has been detached at this point.
+ """
+
+ def main(self):
+ """Read the command line and either start or stop the daemon"""
+ self.parse_options()
+ action = self.options.action
+ self.read_basic_config()
+ if action == 'start':
+ self.start()
+ elif action == 'stop':
+ self.stop()
+ else:
+ raise ValueError(action)
+
+ def parse_options(self):
+ """Parse the command line"""
+ p = optparse.OptionParser()
+ p.add_option('--start', dest='action',
+ action='store_const', const='start', default='start',
+ help='Start the daemon (the default action)')
+ p.add_option('-s', '--stop', dest='action',
+ action='store_const', const='stop', default='start',
+ help='Stop the daemon')
+ p.add_option('-c', dest='config_filename',
+ action='store', default=self.default_conf,
+ help='Specify alternate configuration file name. By default: /etc/oval/server.conf')
+ p.add_option('-n', '--nodaemon', dest='daemonize',
+ action='store_false', default=True,
+ help='Run in the foreground')
+ self.options, self.args = p.parse_args()
+ if not os.path.exists(self.options.config_filename):
+ p.error('configuration file not found: %s'
+ % self.options.config_filename)
+
+ def read_basic_config(self):
+ """Read basic options from the daemon config file"""
+ self.config_filename = self.options.config_filename
+ cp = ConfigParser.ConfigParser()
+ cp.read([self.config_filename])
+ self.config_parser = cp
+
+ try:
+ self.uid, self.gid = get_uid_gid(cp, self.section)
+ except ValueError, e:
+ sys.exit(str(e))
+
+ self.pidfile = cp.get(self.section, 'pidfile')
+ self.logfile = cp.get(self.section, 'logfile')
+ self.loglevel = cp.get(self.section, 'loglevel')
+
+ def on_sigterm(self, signalnum, frame):
+ """Handle segterm by treating as a keyboard interrupt"""
+ raise KeyboardInterrupt('SIGTERM')
+
+ def add_signal_handlers(self):
+ """Register the sigterm handler"""
+ signal.signal(signal.SIGTERM, self.on_sigterm)
+
+ def start(self):
+ """Initialize and run the daemon"""
+ # The order of the steps below is chosen carefully.
+ # - don't proceed if another instance is already running.
+ self.check_pid()
+ # - start handling signals
+ self.add_signal_handlers()
+ # - create log file and pid file directories if they don't exist
+ self.prepare_dirs()
+
+ # - start_logging must come after check_pid so that two
+ # processes don't write to the same log file, but before
+ # setup_root so that work done with root privileges can be
+ # logged.
+ self.start_logging()
+ try:
+ # - set up with root privileges
+ self.setup_root()
+ # - drop privileges
+ self.set_uid()
+ # - check_pid_writable must come after set_uid in order to
+ # detect whether the daemon user can write to the pidfile
+ self.check_pid_writable()
+ # - set up with user privileges before daemonizing, so that
+ # startup failures can appear on the console
+ self.setup_user()
+
+ # - daemonize
+ if self.options.daemonize:
+ daemonize()
+ except:
+ logging.exception("failed to start due to an exception")
+ raise
+
+ # - write_pid must come after daemonizing since the pid of the
+ # long running process is known only after daemonizing
+ self.write_pid()
+ try:
+ logging.info("started")
+ try:
+ self.run()
+ except (KeyboardInterrupt, SystemExit):
+ pass
+ except:
+ logging.exception("stopping with an exception")
+ raise
+ finally:
+ self.remove_pid()
+ logging.info("stopped")
+
+ def stop(self):
+ """Stop the running process"""
+ if self.pidfile and os.path.exists(self.pidfile):
+ pid = int(open(self.pidfile).read())
+ os.kill(pid, signal.SIGTERM)
+ # wait for a moment to see if the process dies
+ for n in range(10):
+ time.sleep(0.25)
+ try:
+ # poll the process state
+ os.kill(pid, 0)
+ except OSError, why:
+ if why[0] == errno.ESRCH:
+ # process has died
+ break
+ else:
+ raise
+ else:
+ sys.exit("pid %d did not die" % pid)
+ #os.kill(pid, signal.SIGKILL)
+ else:
+ sys.exit("not running")
+
+ def prepare_dirs(self):
+ """Ensure the log and pid file directories exist and are writable"""
+ for fn in (self.pidfile, self.logfile):
+ if not fn:
+ continue
+ parent = os.path.dirname(fn)
+ if not os.path.exists(parent):
+ os.makedirs(parent)
+ self.chown(parent)
+
+ def set_uid(self):
+ """Drop root privileges"""
+ if self.gid:
+ try:
+ os.setgid(self.gid)
+ except OSError, (code, message):
+ sys.exit("can't setgid(%d): %s, %s" %
+ (self.gid, code, message))
+ if self.uid:
+ try:
+ os.setuid(self.uid)
+ except OSError, (code, message):
+ sys.exit("can't setuid(%d): %s, %s" %
+ (self.uid, code, message))
+
+ def chown(self, fn):
+ """Change the ownership of a file to match the daemon uid/gid"""
+ if self.uid or self.gid:
+ uid = self.uid
+ if not uid:
+ uid = os.stat(fn).st_uid
+ gid = self.gid
+ if not gid:
+ gid = os.stat(fn).st_gid
+ try:
+ os.chown(fn, uid, gid)
+ except OSError, (code, message):
+ sys.exit("can't chown(%s, %d, %d): %s, %s" %
+ (repr(fn), uid, gid, code, message))
+
+ def start_logging(self):
+ """Configure the logging module"""
+ try:
+ level = int(self.loglevel)
+ except ValueError:
+ level = int(logging.getLevelName(self.loglevel.upper()))
+
+ handlers = []
+ if self.logfile:
+ handlers.append(logging.FileHandler(self.logfile))
+ self.chown(self.logfile)
+ if not self.options.daemonize:
+ # also log to stderr
+ handlers.append(logging.StreamHandler())
+
+ log = logging.getLogger()
+ log.setLevel(level)
+ for h in handlers:
+ h.setFormatter(logging.Formatter(
+ "%(asctime)s %(threadName)s %(levelname)s %(message)s"))
+ log.addHandler(h)
+
+ def check_pid(self):
+ """Check the pid file.
+
+ Stop using sys.exit() if another instance is already running.
+ If the pid file exists but no other instance is running,
+ delete the pid file.
+ """
+ if not self.pidfile:
+ return
+ # based on twisted/scripts/twistd.py
+ if os.path.exists(self.pidfile):
+ try:
+ pid = int(open(self.pidfile).read().strip())
+ except ValueError:
+ msg = 'pidfile %s contains a non-integer value' % self.pidfile
+ sys.exit(msg)
+ try:
+ os.kill(pid, 0)
+ except OSError, (code, text):
+ if code == errno.ESRCH:
+ # The pid doesn't exist, so remove the stale pidfile.
+ os.remove(self.pidfile)
+ else:
+ msg = ("failed to check status of process %s "
+ "from pidfile %s: %s" % (pid, self.pidfile, text))
+ sys.exit(msg)
+ else:
+ msg = ('another instance seems to be running (pid %s), '
+ 'exiting' % pid)
+ sys.exit(msg)
+
+ def check_pid_writable(self):
+ """Verify the user has access to write to the pid file.
+
+ Note that the eventual process ID isn't known until after
+ daemonize(), so it's not possible to write the PID here.
+ """
+ if not self.pidfile:
+ return
+ if os.path.exists(self.pidfile):
+ check = self.pidfile
+ else:
+ check = os.path.dirname(self.pidfile)
+ if not os.access(check, os.W_OK):
+ msg = 'unable to write to pidfile %s' % self.pidfile
+ sys.exit(msg)
+
+ def write_pid(self):
+ """Write to the pid file"""
+ if self.pidfile:
+ open(self.pidfile, 'wb').write(str(os.getpid()))
+
+ def remove_pid(self):
+ """Delete the pid file"""
+ if self.pidfile and os.path.exists(self.pidfile):
+ os.remove(self.pidfile)
+
+
+def get_uid_gid(cp, section):
+ """Get a numeric uid/gid from a configuration file.
+
+ May return an empty uid and gid.
+ """
+ uid = cp.get(section, 'uid')
+ if uid:
+ try:
+ int(uid)
+ except ValueError:
+ # convert user name to uid
+ try:
+ uid = pwd.getpwnam(uid)[2]
+ except KeyError:
+ raise ValueError("user is not in password database: %s" % uid)
+
+ gid = cp.get(section, 'gid')
+ if gid:
+ try:
+ int(gid)
+ except ValueError:
+ # convert group name to gid
+ try:
+ gid = grp.getgrnam(gid)[2]
+ except KeyError:
+ raise ValueError("group is not in group database: %s" % gid)
+
+ return uid, gid
+
+
+def daemonize():
+ """Detach from the terminal and continue as a daemon"""
+ # swiped from twisted/scripts/twistd.py
+ # See http://www.erlenstar.demon.co.uk/unix/faq_toc.html#TOC16
+ if os.fork(): # launch child and...
+ os._exit(0) # kill off parent
+ os.setsid()
+ if os.fork(): # launch child and...
+ os._exit(0) # kill off parent again.
+ os.umask(077)
+ null=os.open('/dev/null', os.O_RDWR)
+ for i in range(3):
+ try:
+ os.dup2(null, i)
+ except OSError, e:
+ if e.errno != errno.EBADF:
+ raise
+ os.close(null)
Property changes on: trunk/oval-infrastructure/src/daemon.py
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/oval-infrastructure/src/dsa2oval.py (from rev 379, trunk/oval-server/dsa2oval.py)
===================================================================
--- trunk/oval-infrastructure/src/dsa2oval.py (rev 0)
+++ trunk/oval-infrastructure/src/dsa2oval.py 2008-09-23 17:38:18 UTC (rev 380)
@@ -0,0 +1,191 @@
+#!/usr/bin/python2.4
+# -*- coding: utf-8 -*-
+#
+# (c) 2007 Pavel Vinogradov
+# (c) 2004 Javier Fernandez-Sanguino
+# Licensed under the GNU General Public License version 2.
+#
+# Extract data from DSA files and create OVAL queries witch can
+# be used with the OVAL query interpreter (see http://oval.mitre.org)
+import os
+import sys
+import getopt
+import logging
+
+from oval.dsa2oval.definition import generator
+from oval.dsa2oval.parser import dsa
+from oval.dsa2oval.parser import wml
+#from guppy import hpy
+
+assert sys.version_info >= (2,4), 'Requires Python 2.4 or better'
+#h = hpy()
+
+class Walker:
+
+ dsaref = {}
+
+ def __init__ (self, dataExt = '.data', infoExt = '.wml'):
+ """
+ @type dataExt: C(string)
+ @param dataExt: filename postfix of files which contains data of DSA
+ @type infoExt: C(string)
+ @param infoExt: filename postfix of files which contains description of DSA
+ """
+
+ self.dataExt = dataExt
+ self.infoExt = infoExt
+
+ def printDSA (self):
+ """ Generate and print OVAL Definitions for collected DSA information
+
+ Use generator from dsa2oval package for convert all DSA stored in dict
+ to proper formated XML file.
+ """
+ ovalBuilder = generator.OVALGenerator()
+
+# print "Before: ovalBuilder.printOVALDefinitions (self.dsaref)"
+# print h.heap()
+ ovalBuilder.printOVALDefinitions (self.dsaref)
+
+# print "After: ovalBuilder.printOVALDefinitions (self.dsaref)"
+# print h.heap()
+
+ def parseDir (self, directory, depth):
+ """ Recursive search directory for DSA files contain postfix in their names.
+
+ Starting from specified directory recursive parse all files which contain
+ postfix or wml in their name.
+ For this files called dsa.parseFile() or wml.parseFile() (from parser package)
+ for extracting DSA information.
+ Results stored in global dict dsaref
+
+ @type directory: C(string)
+ @param directory: top of parsed filesystem hierarhy
+ @type depth: C(integer)
+ @param depth: maximum recursion depth
+ """
+
+ if depth == 0:
+ logging.log(logging.DEBUG, "Maximum depth reached at directory " + directory)
+ return (0)
+
+ for file in os.listdir (directory):
+
+ path = "%s/%s" % (directory, file)
+
+ logging.log (logging.DEBUG, "Checking %s (for %s at %s)" % (file, self.dataExt, depth))
+
+ if os.access(path, os.R_OK) and os.path.isdir (path) and not os.path.islink (path) and file[0] != '.':
+ logging.log(logging.DEBUG, "Entering directory " + path)
+ self.parseDir (path, depth-1)
+
+ #Parse DSA data files
+ if os.access(path, os.R_OK) and file.endswith(self.dataExt) and file[0] != '.' and file[0] != '#':
+ result = dsa.parseFile (path)
+ if result:
+ if self.dsaref.has_key (result[0]):
+ for (k, v) in result[1].iteritems():
+ self.dsaref[result[0]][k] = v
+ else:
+ self.dsaref[result[0]] = result[1]
+
+ #Parse DSA wml descriptions
+ if os.access(path, os.R_OK) and file.endswith(self.infoExt) and file[0] != '.' and file[0] != '#':
+ result = wml.parseFile(path)
+ if result:
+ if self.dsaref.has_key (result[0]):
+ for (k, v) in result[1].iteritems():
+ self.dsaref[result[0]][k] = v
+ else:
+ self.dsaref[result[0]] = result[1]
+
+ return 0
+
+ def parseFile (self, filename):
+ """ Parse specifi DSA data and wml file.
+
+ Parse specified DSA data file and according wml file.
+ Create OVAl definition and store in global variable dsaref..
+
+ @type filename: C(string)
+ @param filename: path to DSA file
+ @rtype: C(int)
+ """
+
+ (path, ext) = os.path.splitext(filename)
+ dsaFile = ''.join((path, self.dataExt))
+ wmlFile = ''.join((path, self.infoExt))
+
+ #Parse data file
+ result = dsa.parseFile (dsaFile)
+ if result:
+ if self.dsaref.has_key (result[0]):
+ for (k, v) in result[1].iteritems():
+ self.dsaref[result[0]][k] = v
+ else:
+ self.dsaref[result[0]] = result[1]
+
+ #Parse according wml file
+ result = wml.parseFile(wmlFile)
+ if result:
+ if self.dsaref.has_key (result[0]):
+ for (k, v) in result[1].iteritems():
+ self.dsaref[result[0]][k] = v
+ else:
+ self.dsaref[result[0]] = result[1]
+
+ return 0
+
+ return -1
+
+def usage (prog = "dsa2oval"):
+ """Print information about script flags and options
+
+ @type prog: C(string)
+ @param prog: name of executable
+ """
+
+ print """
+usage: %s [vh] [-d <directory> | -f <path to file>]
+\t-d\twhich directory use for dsa definition search
+\t-f\twhich file use for dsa definition generation
+\t-v\tverbose mode
+\t-h\tthis help
+ """ % prog
+
+if __name__ == "__main__":
+
+ # Parse cmd options with getopt
+ opts = {}
+ #By default we search dsa definitions from current directory, but -d option override this
+ opts['-d'] = "./"
+
+ try:
+ opt, args = getopt.getopt (sys.argv[1:], 'vhd:f:')
+ except getopt.GetoptError:
+ usage ()
+ sys.exit(1)
+
+ for key, value in opt:
+ opts[key] = value
+
+ if opts.has_key ('-h'):
+ usage()
+ sys.exit(0)
+
+ if opts.has_key('-v'):
+ logging.basicConfig(level=logging.WARNING)
+ else:
+ logging.basicConfig(level=logging.ERROR)
+
+ walker = Walker();
+
+ if opts.has_key('-f'):
+ walker.parseFile (opts['-f'])
+ walker.printDSA()
+ sys.exit(0)
+
+ if opts.has_key('-d'):
+ walker.parseDir(opts['-d'], 2)
+ walker.printDSA()
+ sys.exit(0)
\ No newline at end of file
Property changes on: trunk/oval-infrastructure/src/dsa2oval.py
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Copied: trunk/oval-infrastructure/src/oval (from rev 379, trunk/oval-server/oval)
Property changes on: trunk/oval-infrastructure/src/oval
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/oval-infrastructure/src/oval-monitor.py (from rev 379, trunk/oval-server/oval-monitor.py)
===================================================================
--- trunk/oval-infrastructure/src/oval-monitor.py (rev 0)
+++ trunk/oval-infrastructure/src/oval-monitor.py 2008-09-23 17:38:18 UTC (rev 380)
@@ -0,0 +1,208 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+# # Written by Pavel Vinogradov
+# Licensed under the GNU General Public License version 2.
+
+from ConfigParser import SafeConfigParser
+from oval.dba.dba import dba, dbaNotAccesible
+import os, sys, time, getopt
+import traceback, exceptions
+sys.path = ['/usr/share/oval-server'] + sys.path
+from oval.dba.dba import dba, dbaNotAccesible
+
+assert sys.version_info >= (2,4), 'Requires Python 2.4 or better'
+
+class configNotFoundError (Exception):
+ pass
+
+def usage (prog = 'oval-monitor.py'):
+ """Print information about script flags and options"""
+
+ print """usage: python %s [-h] [-c <config>] [-a <agent ip>] [-d <dsa id>]
+\t-h\tthis help
+\t-c\tpath to config file (by default /etc/oval/server.conf
+\t-a\tagent id
+\t-d\tDebian Security Annnounce id
+""" % prog
+
+class Report:
+
+ config = SafeConfigParser()
+
+ def __init__(self, cfgfile):
+ try:
+ # Read global server config
+ if not self.config.read(cfgfile):
+ raise configNotFoundError, 'Config file %s not found.\n' % cfgfile
+
+ self.dbPath = self.config.get ('general', 'db')
+ #Init static fields in dba and Dsa2Oval classes
+ dba.dbPath = self.dbPath
+ self.db = dba ()
+ except Exception, e:
+ raise e
+
+ def getAgentAffectedVuln (self, agentID):
+ """ Return list of affected DSA for certain agent
+
+ Return list of DSA numbers which affected host for certain agent.
+
+ @type agentID: C(integer)
+ @param agentID: Identificator of inspected agent
+ @rtype: C(list)
+ @return: list of DSA numbers
+ """
+
+ cursor = self.db.getCursor()
+
+ cursor.execute ('SELECT vulnDSA from affected WHERE agentID = %d and status = 1' % agentID)
+ result = cursor.fetchall()
+ return result
+
+ def getAgentNottestedVuln (self, agentID):
+ """ Return list of not tested DSA for certain agent
+
+ Return list of DSA numbers which not tested again host for certain agent.
+
+ @type agentID: C(integer)
+ @param agentID: Identificator of inspected agent
+ @rtype: C(list)
+ @return: list of DSA numbers
+ """
+
+ cursor = self.db.getCursor()
+
+ cursor.execute ("""SELECT vulnDSA FROM vulnerabilities
+ WHERE vulnDSA NOT IN (
+ SELECT vulnDSA FROM affected where agentID = %d);
+ """ % agentID)
+ result = cursor.fetchall()
+ return result
+
+ def reportAgent (self, agentID):
+ """Generate report for certain agent.
+
+ Generate report, which include list of affected and not tested DSA.
+ Also contain number of not affected DSA.
+
+ @type agentID: C(integer)
+ @param agentID: Identificator of inspected agent
+ """
+
+ cursor = self.db.getCursor()
+
+ cursor.execute ('SELECT vulnDSA, status from affected WHERE agentID = %d' % agentID)
+ dsas = cursor.fetchall()
+ count = 0
+
+ print 'Agent %d:' % agentID
+ for dsa in dsas:
+ if dsa[1] == 1:
+ print '\tAffected to DSA ID %s' % dsa[0]
+ else:
+ count += 1
+ print '\tNot affected to %d DSA' % count
+
+ print '--------------------------'
+ cursor.execute ("""SELECT vulnerabilities.vulnDSA FROM vulnerabilities
+ OUTER JOIN affected
+ ON vulnerabilities.vulnDSA = affected.vulnDSA
+ WHERE affected.agentID = %d AND vulnerabilities.vulnTimestamp > affected.vulnTimestamp OR affected.vulnTimestamp IS NULL;""" % agentID)
+
+ dsas = cursor.fetchall()
+ count = 0
+ for dsa in dsas:
+ print 'Not tested again DSA ID %s' %dsa[0]
+ count += 1
+
+ def reportDSA (self, dsaID):
+ """Generate report for certain DSA.
+
+ Generate report, which include list of affected and not tested agents
+ again certain DSA.
+
+ @type agentID: C(integer)
+ @param agentID: Identificator of inspected DSA
+ """
+
+ cursor = self.db.getCursor()
+ cursor.execute ('SELECT affected.agentID, agents.agentName from affected JOIN agents on affected.agentID = agents.agentID WHERE vulnDSA = %d and status = 1' % dsaID)
+ agents = cursor.fetchall ()
+ print 'Agents affected to DSA %d:' % dsaID
+ for agent in agents:
+ print '\t%d \t %s' % (agent[0], agent[1])
+
+ print '------------------------------'
+ cursor.execute ("""
+ SELECT agentID, agentName from agents
+ WHERE agentID NOT IN (
+ SELECT agentID FROM affected WHERE vulnDSA = %d);""" % dsaID)
+ agents = cursor.fetchall ()
+ print 'Agents not tested to DSA %d:' % dsaID
+ for agent in agents:
+ print '\t%d \t %s' % (agent[0], agent[1])
+
+ def reportFull (self):
+ """Generate full report about status of all agents.
+
+ Generate report, which include list of all registered agents with:
+ ID, IP, number of affected and not tested DSA.
+ """
+ cursor = self.db.getCursor()
+
+ cursor.execute ("SELECT * FROM agents;")
+ agents = cursor.fetchall()
+
+ print 'Agents: (ID \t IP \t\t Aff \tNot tested)'
+ for agent in agents:
+ print '\t %d \t %s \t %s \t %s' % (agent[0], agent[1], len(self.getAgentAffectedVuln(agent[0])), len(self.getAgentNottestedVuln(agent[0])))
+
+ cursor.execute ("SELECT count(*) from vulnerabilities;")
+ dsas = cursor.fetchall()[0][0]
+ print 'DSA in repository: %d' % dsas
+
+if __name__ == "__main__":
+ #Parse command line options.
+ #By default we search for config file in global etc directory
+ opts = {'-c' : '/etc/oval/server.conf'}
+
+ try:
+ opt, args = getopt.getopt (sys.argv[1:], 'hc:a:d:')
+ except getopt.GetoptError:
+ usage (sys.argv[0])
+ sys.exit(1)
+
+ for key, value in opt:
+ opts[key] = value
+
+ if opts.has_key ('-h'):
+ usage(sys.argv[0])
+ sys.exit(0)
+
+ try:
+ reporter = Report (opts['-c'])
+
+ if opts.has_key ('-a'):
+ try:
+ reporter.reportAgent (int(opts['-a']))
+ except ValueError:
+ print 'Please enter numeric agent ID'
+ else:
+ if opts.has_key ('-d'):
+ try:
+ reporter.reportDSA (int(opts['-d']))
+ except ValueError:
+ print 'Please enter numeric DSA id'
+ else:
+ reporter.reportFull ()
+
+ except configNotFoundError, e:
+ sys.stderr.write (str(e))
+ except dbaNotAccesible, e:
+ sys.stderr.write ("ERROR: Can't access to database file\n")
+ usage(sys.argv[0])
+ except exceptions.SystemExit, e:
+ raise e
+ except Exception, e:
+ sys.stderr.write('ERROR: Unhandled error during execution: %s : %s.\n' % (e.__class__, str(e)))
+ traceback.print_exc()
Property changes on: trunk/oval-infrastructure/src/oval-monitor.py
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Copied: trunk/oval-infrastructure/src/oval-server.py (from rev 379, trunk/oval-server/oval-server.py)
===================================================================
--- trunk/oval-infrastructure/src/oval-server.py (rev 0)
+++ trunk/oval-infrastructure/src/oval-server.py 2008-09-23 17:38:18 UTC (rev 380)
@@ -0,0 +1,225 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Written by Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
+# Licensed under the GNU General Public License version 2.
+
+"""Start OVAL server program."""
+
+import daemon
+from ConfigParser import SafeConfigParser
+from threading import Thread
+import os, logging, sys, time
+import traceback, exceptions
+sys.path = ['/usr/share/oval-server'] + sys.path
+from oval.dsa2oval import convertor
+from oval.dba.dba import dba
+
+assert sys.version_info >= (2,4), 'Requires Python 2.4 or better'
+
+class OvalServerNotSupported(Exception):
+ pass
+
+class configNotFoundError (Exception):
+ pass
+
+class serverThread(Thread):
+ """ serverThread - thread which handle client requests to server.
+
+ Serve requests from clients, particular server type depends
+ on configuration file, but currently inplement only OvalHttpServer.
+ """
+
+ def __init__ (self, config, logger):
+ """ Init class variables and create apropriate server instance
+
+ Use config variable as SafeConfigParser instance to extract
+ apropriate config values.
+
+ Create apropriate server instance to handle clients request
+ (currently support only http server).
+ """
+
+ Thread.__init__(self)
+ self.setName("serverThread")
+ self.type = config['type']
+ self.ip = config['ip']
+ self.port = int(config['port'])
+ self.workdir = config['workdir']
+
+ self.logger = logger
+
+ if self.type == 'http':
+ from oval.server.OvalHttpServer import OvalHttpServer, HttpRequestHandler
+ self.server = OvalHttpServer ((self.ip, self.port), HttpRequestHandler, self.workdir, self.logger)
+ self.logger.info('Run local server on %s:%d in %s' % (self.ip, self.port, self.workdir))
+ else:
+ raise OvalServerNotSupported()
+
+ def run (self):
+ """ Activate request handling
+
+ Run handling of client request in loop until stop()
+ will called.
+
+ For http server - don't interrupted during accept() call.
+ """
+ self.server.serve_forever()
+
+ def stop (self):
+ """ Stop request handling
+
+ Set server execution status to False that interrupt
+ request handling loop"""
+ self.server.stop()
+
+class syncThread(Thread):
+
+ __status = None
+
+ def __init__(self, config, logger):
+ Thread.__init__(self)
+ self.setName("syncThread")
+
+ self.type = config['type']
+ self.source = config['source']
+ self.storage = config['dsa_storage']
+ self.name = config['name']
+ self.update_interval = int(config['update_interval'])
+ self.workdir = config['workdir']
+ self.logger = logger
+
+ if self.type == 'local':
+ from oval.dsaSync.directory import dirSync
+ self.syncer = dirSync(self.source, self.storage, self.logger)
+ self.logger.info('Run local updater %s with: %s, %s' % (self.name, self.source, self.update_interval))
+ if self.type == 'http':
+ from oval.dsaSync.http import httpSync
+ self.syncer = httpSync(self.source, self.storage, config['server'], self.logger)
+ self.logger.info('Run http updater %s with: %s, %s' % (self.name, self.source, self.update_interval))
+ if self.type == 'ftp':
+ from oval.dsaSync.ftp import ftpSync
+ self.syncer = ftpSync(self.source, self.storage, config['server'], self.logger)
+ self.logger.info('Run ftp updater %s with: %s, %s' % (self.name, self.source, self.update_interval))
+
+ def run (self):
+ self.__status = True
+ self.db = dba ()
+ conv = convertor.Dsa2Oval (self.workdir)
+
+ while self.__status:
+ try:
+ self.logger.debug('Run local sync')
+
+ if self.syncer.sync():
+ self.logger.debug('Run agent sync')
+ for agent in self.db.getAgentsList():
+ self.logger.debug('Sync definitions for agent %s' % agent[1])
+ files = self.db.makeDefList(int(agent[0]))
+ data = conv.createDefList(files)
+ conv.saveOvalDef('%s/%s.xml' % (self.workdir, agent[1]))
+
+ self.logger.debug('sleep')
+ time.sleep(60 * self.update_interval)
+ except Exception, e:
+ self.logger.critical ('Unhandled error in Syncer thread: %s : %s.\n' % (e.__class__, str(e)))
+ self.logger.debug('Shutdown')
+
+ def stop(self):
+ self.__status = False
+
+class mainThread:
+ """ Main program thread.
+
+ Initialize all resource, read config file, create instances of all
+ other threads and run it.
+ """
+
+ config = SafeConfigParser()
+ logger = logging.getLogger()
+
+ def __init__(self, cfgfile):
+ try:
+ # Read global server config
+ if not self.config.read(cfgfile):
+ raise configNotFoundError, 'Config file %s not found.\n' % cfgfile
+
+ self.dsa_storage = self.config.get('general', 'dsa_storage')
+ self.db = self.config.get('general', 'db')
+ #Init static fields in dba and Dsa2Oval classes
+ dba.dbPath = self.db
+ convertor.Dsa2Oval.inputDir = self.dsa_storage
+
+ logdirname = self.config.get('general', 'log_dir')
+ logfilename = self.config.get('general', 'log_file')
+ self.log_level = self.config.get('general', 'log_level')
+ self.outfilename = os.path.join(logdirname, logfilename)
+
+ except IOError, e:
+ sys.stderr.write("Can't create logger handler: " + str(e) + "\n")
+ logging.shutdown()
+ sys.exit(2)
+
+ def readConfigSection (self, section):
+ conf = {}
+
+ if self.config.has_section(section):
+ data = self.config.items(section)
+ for opts in data:
+ conf[opts[0]] = opts[1]
+
+ return conf
+
+ def run(self):
+ self.logger.info('mainThread.RUN')
+
+ try:
+ #Create sync thread
+ conf = self.readConfigSection('source')
+ conf['dsa_storage'] = self.dsa_storage
+ conf['workdir'] = self.config.get('server', 'workdir')
+ syncer = syncThread(conf, self.logger)
+ syncer.start()
+
+ #Create server thread
+ conf = self.readConfigSection('server')
+ server = serverThread(conf, self.logger)
+ server.start()
+
+ #Wait all Threads
+ while syncer.isAlive() or server.isAlive():
+ syncer.join(10)
+ server.join(10)
+
+ except KeyboardInterrupt, e:
+ sys.stderr.write ('mainThread: Execution interrupted by keyboard.\n')
+ syncer.stop()
+ server.stop()
+ syncer.join()
+ server.join()
+ raise KeyboardInterrupt
+
+ self.logger.info('Shutting down')
+ logging.shutdown()
+
+class ovalDaemon(daemon.Daemon):
+ #By default we search for config file in global etc directory
+ default_conf = '/etc/oval/server.conf'
+ section = 'daemon'
+
+ def run(self):
+ logging.info('Debian Oval Server 0.1.')
+
+ #Creat server instance and run it
+ try:
+ main = mainThread(self.config_filename)
+ main.run ()
+ except configNotFoundError, e:
+ sys.stderr.write (str(e))
+ except Exception, e:
+ sys.stderr.write('Unhandled error during execution: %s : %s.\n' % (e.__class__, str(e)))
+ traceback.print_exc()
+
+if __name__ == "__main__":
+ ovalDaemon().main()
+
Property changes on: trunk/oval-infrastructure/src/oval-server.py
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/oval-infrastructure/src/setup.py (from rev 379, trunk/oval-server/setup.py)
===================================================================
--- trunk/oval-infrastructure/src/setup.py (rev 0)
+++ trunk/oval-infrastructure/src/setup.py 2008-09-23 17:38:18 UTC (rev 380)
@@ -0,0 +1,30 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Written by Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
+# Licensed under the GNU General Public License version 2.
+
+"""The oval-agent program for interact with oval-server daemon.
+
+This program used to interact with oval-server deamon, download OVAL
+definitions, quering it and send reports back to server.
+
+"""
+
+import sys
+assert sys.version >= '2.4', "Install Python 2.4 or greater"
+from distutils.core import setup, Extension
+import oval
+
+setup(
+ name = "oval",
+ version = "%s" % oval.__version__,
+ author = "Pavel Vinogradov",
+ author_email = "<oval-devel at lists.alioth.debian.org>",
+ url = "http://oval.alioth.debian.org",
+ license = "GPL2",
+
+ packages = ["oval.dba", "oval.dsa2oval", "oval.dsa2oval.definition", "oval.dsa2oval.parser", "oval.dsaSync", "oval.server", "oval" ],
+
+ scripts = ["oval-server.py", "dsa2oval.py", "oval-monitor.py"]
+ )
Property changes on: trunk/oval-infrastructure/src/setup.py
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
More information about the Oval-commits
mailing list