Update LICENSE

Update README
Add reset and clear-cache option
2025-12-06 21:01:09 -08:00 · 2019-05-15 17:36:13 +09:00 · 2019-05-15 13:20:12 +09:00 · 2019-05-14 18:48:55 +09:00 · 2019-05-14 16:44:23 +09:00 · 2019-05-14 16:44:21 +09:00
33 changed files with 1446 additions and 491 deletions
--- a/674
+++ b/674
@@ -1,21 +1,661 @@
-MIT License
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007

-Copyright (c) 2019 Teppei Fukuda
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.

-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+                            Preamble

-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, 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
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If 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 convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero 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
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state 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 program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program 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 Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.
--- a/README.md
+++ b/README.md
@@ -5,12 +5,74 @@
 [![Go Report Card](https://goreportcard.com/badge/github.com/knqyf263/trivy)](https://goreportcard.com/report/github.com/knqyf263/trivy)
 [![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](https://github.com/knqyf263/trivy/blob/master/LICENSE)

-A Simple and Comprehensive Vulnerability Scanner for Containers
+A Simple and Comprehensive Vulnerability Scanner for Containers, Compatible with CI
+
+<img src="imgs/usage.gif" width="700">
+
+# Accuracy Comparison
+
+<img src="imgs/alpine_comparison.png" width="700">
+
+
+# TOC
+- [Abstract](#abstract)
+- [Features](#features)
+- [Installation](#installation)
+  - [RHEL/CentOS](#rhelcentos)
+  - [Debian/Ubuntu](#debianubuntu)
+  - [Mac OS X / Homebrew](#mac-os-x--homebrew)
+  - [Binary (Including Windows)](#binary-including-windows)
+  - [From source](#from-source)
+- [Quick Start](#quick-start)
+- [Examples](#examples)
+  - [Basic Usage](#basic-usage)
+  - [Scan an image](#scan-an-image)
+  - [Scan an image file](#scan-an-image-file)
+  - [Save the results as JSON](#save-the-results-as-json)
+  - [Filter the vulnerabilities by severities](#filter-the-vulnerabilities-by-severities)
+  - [Skip an update of vulnerability DB](#skip-an-update-of-vulnerability-db)
+  - [Ignore unfixed vulnerabilities](#ignore-unfixed-vulnerabilities)
+  - [Specify exit code](#specify-exit-code)
+  - [Ignore the specified vulnerabilities](#ignore-the-specified-vulnerabilities)
+  - [Clean all caches](#clean-all-caches)
+- [Continuous Integration (CI)](#continuous-integration-ci)
+  - [Travis CI](#travis-ci)
+  - [Circle CI](#circle-ci)
+- [Usage](#usage)
+- [Comparison with other scanners](#comparison-with-other-scanners)
+  - [Overview](#overview)
+  - [vs Clair, Quay](#vs-clair-quay)
+  - [vs Anchore Engine](#vs-anchore-engine)
+  - [vs Docker Hub, GCR](#vs-docker-hub-gcr)
+- [Q&A](#qa)
+  - [Homebrew](#homebrew)
+  - [Others](#others)

 # Abstract
-Scan containers
+`Trivy` is a simple and comprehensive vulnerability scanner for containers.
+`Trivy` detects vulnerabilities of OS packages (Alpine, RHEL, CentOS, etc.) and application dependencies (Bundler, Composer, npm, etc.).
+`Trivy` is easy to use. Just install the binary and you're ready to scan. All you need to do for scanning is to specify a container image name.
+
+It is considered to be used in CI. Before pushing to a container registry, you can scan your local container image easily.
+See [here](#continuous-integration-ci) for details.
+

 # Features
+- Detect comprehensive vulnerabilities
+  - OS packages (Alpine, Red Hat Enterprise Linux, CentOS, Debian, Ubuntu)
+  - **Application dependencies** (Bundler, Composer, Pipenv, npm, Cargo)
+- Simple
+  - Specify only an image name
+- Easy installation
+  - **No need for prerequirements** such as installation of DB, libraries, etc.
+  - `apt-get install`, `yum install` and `brew install` is possible (See [Installation](#installation))
+- High accuracy
+  - **Especially Alpine** (See [Comparison with other scanners](#comparison-with-other-scanners))
+  - Other OSes are also high
+- Continuous Integration
+  - **Compatible with CI** such as Travis CI, CircleCI, Jenkins, etc.
+  - See [CI Example](#continuous-integration-ci)
+

 # Installation

@@ -32,7 +94,7 @@ $ sudo yum -y install trivy
 or

 ```
-$ rpm -ivh https://github.com/knqyf263/trivy/releases/download/v0.0.3/trivy_0.0.3_Linux-64bit.rpm
+$ rpm -ivh https://github.com/knqyf263/trivy/releases/download/v0.0.11/trivy_0.0.11_Linux-64bit.rpm
 ```

 ## Debian/Ubuntu
@@ -53,8 +115,8 @@ or

 ```
 $ sudo apt-get install rpm
-$ wget https://github.com/knqyf263/trivy/releases/download/v0.0.3/trivy_0.0.3_Linux-64bit.deb
-$ sudo dpkg -i trivy_0.0.3_Linux-64bit.deb
+$ wget https://github.com/knqyf263/trivy/releases/download/v0.0.11/trivy_0.0.11_Linux-64bit.deb
+$ sudo dpkg -i trivy_0.0.11_Linux-64bit.deb
 ```

 ## Mac OS X / Homebrew
@@ -65,7 +127,9 @@ $ brew install knqyf263/trivy/trivy
 ```

 ## Binary (Including Windows)
-Go to [the releases page](https://github.com/knqyf263/trivy/releases), find the version you want, and download the zip file. Unpack the zip file, and put the binary to somewhere you want (on UNIX-y systems, /usr/local/bin or the like). Make sure it has execution bits turned on. 
+Go to [the releases page](https://github.com/knqyf263/trivy/releases), find the version you want, and download the zip file. Unpack the zip file, and put the binary to somewhere you want (on UNIX-y systems, /usr/local/bin or the like). Make sure it has execution bits turned on.
+
+You need to install `rpm` command for scanning RHEL/CentOS.

 ## From source

@@ -73,7 +137,87 @@ Go to [the releases page](https://github.com/knqyf263/trivy/releases), find the
 $ go get -u github.com/knqyf263/trivy
 ```

+# Quick Start
+
+Simply specify an image name (and a tag). **The `latest` tag should be avoided as problems occur with cache.**
+
+```
+$ trivy nginx:1.16.0-alpine
+```
+
 # Examples
+### Scan an image file
+
+```
+$ docker save ruby:2.4.6-alpine3.9 -o ruby-2.4.6.tar
+$ trivy --input ruby-2.4.6.tar
+```
+
+### Save the results as JSON
+
+```
+$ trivy -f json -o results.json composer:1.7.2
+```
+
+### Filter the vulnerabilities by severities
+
+```
+$ trivy --severity HIGH,CRITICAL python:3.7-alpine3.9
+```
+
+### Skip an update of vulnerability DB 
+`Trivy` updates vulnerability database every time it is run. This is usually fast as it is a difference update. But if you want to skip even that, use the `--skip-update` option.
+
+```
+$ trivy --skip-update alpine:3.9
+```
+
+### Ignore unfixed vulnerabilities
+By default, `Trivy` also detects unpatched/unfixed vulnerabilities. This means you can't fix these vulnerabilities even if you update all packages.
+If you would like to ignore them, use the `--ignore-unfixed` option.
+
+
+```
+$ trivy --exit-code 1 httpd:2.4.39
+```
+
+### Specify exit code
+By default, `Trivy` exits with code 0 even when vulnerabilities are detected.
+Use the `--exit-code` option if you want to exit with a non-zero exit code.
+
+```
+$ trivy --exit-code 1 httpd:2.4.39
+```
+
+This option is useful for CI/CD. In the following example, the test will fail only when a critical vulnerability is found.
+
+```
+$ trivy --exit-code 0 --severity MEDIUM,HIGH httpd:2.4.39
+$ trivy --exit-code 1 --severity CRITICAL httpd:2.4.39
+```
+
+### Ignore the specified vulnerabilities
+Use `.trivyignore`.
+
+```
+$ cat .trivyignore
+# Accept the risk
+CVE-2018-14618
+
+# No impact in our settings
+CVE-2019-3855
+
+$ trivy composer:1.7.2 
+```
+
+### Clean all caches
+The `--clean` option remove all caches. After this, it takes a long time as the vulnerability database needs to be rebuilt locally.
+
+```
+$ trivy --clean
+```
+
+
 ## Continuous Integration (CI)
 Scan your image built in Travis CI/CircleCI. The test will fail if a vulnerability is found. When you don't want to fail the test, specify `--exit-code 0` .

@@ -87,10 +231,11 @@ services:

 before_install:
  - docker build -t trivy-ci-test:latest .
-  - wget https://github.com/knqyf263/trivy/releases/download/v0.0.3/trivy_0.0.3_Linux-64bit.tar.gz
-  - tar zxvf trivy_0.0.3_Linux-64bit.tar.gz
+  - wget https://github.com/knqyf263/trivy/releases/download/v0.0.11/trivy_0.0.11_Linux-64bit.tar.gz
+  - tar zxvf trivy_0.0.11_Linux-64bit.tar.gz
 script:
-  - ./trivy --exit-code 1 --quiet trivy-ci-test:latest
+  - ./trivy --exit-code 0 --severity HIGH --quiet trivy-ci-test:latest
+  - ./trivy --exit-code 1 --severity CRITICAL --quiet trivy-ci-test:latest
 cache:
  directories:
    - $HOME/.cache/trivy
@@ -118,8 +263,8 @@ jobs:
      - run:
          name: Install trivy
          command: |
-            wget https://github.com/knqyf263/trivy/releases/download/v0.0.4/trivy_0.0.4_Linux-64bit.tar.gz
-            tar zxvf trivy_0.0.4_Linux-64bit.tar.gz
+            wget https://github.com/knqyf263/trivy/releases/download/v0.0.11/trivy_0.0.11_Linux-64bit.tar.gz
+            tar zxvf trivy_0.0.11_Linux-64bit.tar.gz
            mv trivy /usr/local/bin
      - run:
          name: Scan the local image with trivy
@@ -141,13 +286,12 @@ repository: https://github.com/knqyf263/trivy-ci-test
 # Usage

 ```
-$ trivy -h
 NAME:
  trivy - A simple and comprehensive vulnerability scanner for containers
 USAGE:
-  main [options] image_name
+  trivy [options] image_name
 VERSION:
-  0.0.3
+  0.0.11
 OPTIONS:
  --format value, -f value    format (table, json) (default: "table")
  --input value, -i value     input file path instead of image name
@@ -157,11 +301,68 @@ OPTIONS:
  --skip-update               skip db update
  --clean, -c                 clean all cache
  --quiet, -q                 suppress progress bar
+  --ignore-unfixed            display only fixed vulnerabilities
+  --refresh                   refresh DB (usually used after version update of trivy
  --debug, -d                 debug mode
  --help, -h                  show help
  --version, -v               print the version
+```
+
+# Comparison with other scanners
+## Overview
+The following table shows a result of scanning `composer:1.7.2` (selected randomly).
+In this case, the union of vulnerabilities detected by all vulnerability scanners is used as a data set.
+Of course, there may be vulnerabilities that all scanners could not detect.
+
+See [spreadsheet](https://docs.google.com/spreadsheets/d/16uj9vGh2PHMcVwb_D4h0nYUSvzCAxcnUz9UgQaDCYs4/edit#gid=0) for details.
+
+Date: 2019/05/12
+
+| Scanner   | Clair | Quay | MircoScanner | Docker Hub | Anchore Engine | Trivy |
+|-----------|-------|------|--------------|------------|---------------|-------|
+| Accuracy  | 75%   | 75%  | 66%          | 22%        | 74%           | **85%**   |
+| Precision | 100%  | 100% | 89%          | 26%        | 100%          | **100%**  |
+
+Reference: [Clair](https://github.com/coreos/clair), [Quay](https://quay.io/), [MicroScanner(Free)](https://github.com/aquasecurity/microscanner), [Docker Hub](https://hub.docker.com/), [Anchore Engine](https://anchore.com/engine/)
+
+`Trivy` has high accuracy and high precision, especially in the case of Alpine Linux.
+In the case of other OS, the result is similar to other container scanners.
+
+## vs Clair, Quay
+[Clair](https://github.com/coreos/clair) and [Quay](https://quay.io/) uses [alpine-secdb](https://github.com/alpinelinux/alpine-secdb/).
+However, the purpose of this database is to make it possible to know what packages has backported fixes.
+As README says, it is not a complete database of all security issues in Alpine.
+
+`Trivy` collects vulnerability information in Alpine Linux from [Alpine LInux Redmine](https://bugs.alpinelinux.org/projects/alpine/issues).
+Then, those vulnerabilities will be saved on [vuln-list](https://github.com/knqyf263/vuln-list/tree/master/alpine)
+
+`alpine-secdb` has 6959 vulnerabilities (as of 2019/05/12).
+`vuln-list` has 11101 vulnerabilities related with Alpine Linux (as of 2019/05/12).
+There is a difference in detection accuracy because the number of vulnerabilities is nearly doubled.
+
+In addition, `Trivy` analyzes the middle layer as well and find out which version of the library was used for static linking.
+
+`Clair` can not handle the following cases because it analyzes the image after applying the all layers.

 ```
+RUN apk add --no-cache sqlite-dev \
+    && wget https://xxx/yyy.tar.gz \
+    && tar zxvf yyy.tar.gz && cd yyy \
+    && make && make install \
+    && apk del sqlite-dev
+```
+
+Finally, `Trivy` can also detect vulnerabilities in application dependent libraries such as Bundler, Composer, Pipenv, etc.
+
+## vs Anchore Engine
+Similar to Clair, there is a difference in detection accuracy on Alpine Linux. Also, Anchore Engine needs some steps to start scanning.
+`Trivy` is much easier to use.
+
+## vs Docker Hub, GCR
+Docker Hub can scan only official images. GCR hardly detects vulnerability on Alpine Linux. Also, it is locked to a specific registry.
+
+`Trivy` does not depend on the registry. In addition, it is easy to be integrated with CI/CD services.
+

 # Q&A
 ## Homebrew
@@ -179,7 +380,7 @@ echo 'export HOMEBREW_GITHUB_API_TOKEN=your_token_here' >> ~/.zshrc

 Try:
 ```
-$ printf "protocol=https\nhost=github.com\n" | git credential-osxkeychain erase 
+$ printf "protocol=https\nhost=github.com\n" | git credential-osxkeychain erase
 ```

 ### Error: knqyf263/trivy/trivy 64 already installed
@@ -199,11 +400,18 @@ $ brew install knqyf263/trivy/trivy
 ```

 ## Others
+### Detected version update of trivy. Please try again with --refresh option
+Try again with `--refresh` option
+
+```
+$ trivy --refresh alpine:3.9
+```
+
 ### Unknown error
 Try again with `--clean` option

 ```
-$ trivy --clean alpine:3.8
+$ trivy --clean
 ```

 # Contribute
--- a/cmd/remic/main.go
+++ b/cmd/remic/main.go
@@ -1,67 +0,0 @@
-package main
-
-import (
-	"os"
-	"strings"
-
-	"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability"
-
-	"github.com/knqyf263/trivy/pkg/remic"
-	"github.com/urfave/cli"
-
-	"github.com/knqyf263/trivy/pkg/log"
-)
-
-func main() {
-	cli.AppHelpTemplate = `NAME:
-  {{.Name}}{{if .Usage}} - {{.Usage}}{{end}}
-USAGE:
-  {{if .UsageText}}{{.UsageText}}{{else}}{{.HelpName}} {{if .VisibleFlags}}[options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}{{end}}{{if .Version}}{{if not .HideVersion}}
-VERSION:
-  {{.Version}}{{end}}{{end}}{{if .Description}}
-DESCRIPTION:
-  {{.Description}}{{end}}{{if len .Authors}}
-AUTHOR{{with $length := len .Authors}}{{if ne 1 $length}}S{{end}}{{end}}:
-  {{range $index, $author := .Authors}}{{if $index}}
-  {{end}}{{$author}}{{end}}{{end}}{{if .VisibleCommands}}
-OPTIONS:
-  {{range $index, $option := .VisibleFlags}}{{if $index}}
-  {{end}}{{$option}}{{end}}{{end}}
-`
-	app := cli.NewApp()
-	app.Name = "remic"
-	app.Version = "0.0.1"
-	app.ArgsUsage = "file"
-
-	app.Usage = "A simple and fast tool for detecting vulnerabilities in application dependencies"
-
-	app.Flags = []cli.Flag{
-		cli.StringFlag{
-			Name:  "format, f",
-			Value: "table",
-			Usage: "format (table, json)",
-		},
-		cli.StringFlag{
-			Name:  "severity, s",
-			Value: strings.Join(vulnerability.SeverityNames, ","),
-			Usage: "severity of vulnerabilities to be displayed",
-		},
-		cli.StringFlag{
-			Name:  "output, o",
-			Usage: "output file name",
-		},
-		cli.BoolFlag{
-			Name:  "debug, d",
-			Usage: "debug mode",
-		},
-	}
-
-	app.Action = func(c *cli.Context) error {
-		return remic.Run(c)
-	}
-
-	err := app.Run(os.Args)
-	if err != nil {
-		log.Logger.Fatal(err)
-	}
-}
--- a/cmd/trivy/main.go
+++ b/cmd/trivy/main.go
@@ -70,8 +70,12 @@ OPTIONS:
 			Usage: "skip db update",
 		},
 		cli.BoolFlag{
-			Name:  "clean, c",
-			Usage: "clean all cache",
+			Name:  "reset",
+			Usage: "remove all caches and database",
+		},
+		cli.BoolFlag{
+			Name:  "clear-cache, c",
+			Usage: "clear image caches",
 		},
 		cli.BoolFlag{
 			Name:  "quiet, q",
--- a/go.mod
+++ b/go.mod
@@ -3,15 +3,17 @@ module github.com/knqyf263/trivy
 go 1.12

 require (
+	github.com/BurntSushi/toml v0.3.1
 	github.com/briandowns/spinner v0.0.0-20190319032542-ac46072a5a91
 	github.com/emirpasic/gods v1.12.0 // indirect
 	github.com/etcd-io/bbolt v1.3.2
 	github.com/fatih/color v1.7.0
+	github.com/genuinetools/reg v0.16.0
 	github.com/gliderlabs/ssh v0.1.3 // indirect
 	github.com/golang/protobuf v1.3.1 // indirect
-	github.com/knqyf263/fanal v0.0.0-20190507123206-ceab60083e70
+	github.com/knqyf263/fanal v0.0.0-20190514052804-ca40e6cb0e1a
 	github.com/knqyf263/go-deb-version v0.0.0-20170509080151-9865fe14d09b
-	github.com/knqyf263/go-dep-parser v0.0.0-20190429154931-c377a5391790
+	github.com/knqyf263/go-dep-parser v0.0.0-20190511063217-d5d543bfc261
 	github.com/knqyf263/go-rpm-version v0.0.0-20170716094938-74609b86c936
 	github.com/knqyf263/go-version v1.1.1
 	github.com/mattn/go-colorable v0.1.1 // indirect
--- a/go.sum
+++ b/go.sum
@@ -4,6 +4,7 @@ cloud.google.com/go v0.37.4 h1:glPeL3BQJsbF6aIIYfZizMwc5LTYz250bDMjttbBGAU=
 cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/GoogleCloudPlatform/docker-credential-gcr v1.5.0 h1:wykTgKwhVr2t2qs+xI020s6W5dt614QqCHV+7W9dg64=
 github.com/GoogleCloudPlatform/docker-credential-gcr v1.5.0/go.mod h1:BB1eHdMLYEFuFdBlRMb0N7YGVdM5s6Pt0njxgvfbGGs=
@@ -31,8 +32,6 @@ github.com/containerd/continuity v0.0.0-20180921161001-7f53d412b9eb h1:qSMRxG547
 github.com/containerd/continuity v0.0.0-20180921161001-7f53d412b9eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/coreos/clair v0.0.0-20180919182544-44ae4bc9590a h1:glxUtT0RlaVJU86kg78ygzfhwW6D+uj5H+aOK01QDgI=
 github.com/coreos/clair v0.0.0-20180919182544-44ae4bc9590a/go.mod h1:uXhHPWAoRqw0jJc2f8RrPCwRhIo9otQ8OEWUFtpCiwA=
-github.com/d4l3k/messagediff v1.2.1 h1:ZcAIMYsUg0EAp9X+tt8/enBE/Q8Yd5kzPynLyKptt9U=
-github.com/d4l3k/messagediff v1.2.1/go.mod h1:Oozbb1TVXFac9FtSIxHBMnBCq2qeH/2KkEQxENCrlLo=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -115,14 +114,12 @@ github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e h1:RgQk53JHp
 github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/knqyf263/berkeleydb v0.0.0-20190501065933-fafe01fb9662/go.mod h1:bu1CcN4tUtoRcI/B/RFHhxMNKFHVq/c3SV+UTyduoXg=
-github.com/knqyf263/fanal v0.0.0-20190506110705-2b5cb3000ff6 h1:iSztZNfwEPMN2CvUX1SxNEclRZn+rwRMdsnAegxRJk4=
-github.com/knqyf263/fanal v0.0.0-20190506110705-2b5cb3000ff6/go.mod h1:OiuWIClssf5WzbMcR8lfspdBVaP+vRQndY4kHeFgrDw=
-github.com/knqyf263/fanal v0.0.0-20190507123206-ceab60083e70 h1:L27WBZxk7N70WilG91kgvs0EnV+JVCoOTsNQa8tMBJs=
-github.com/knqyf263/fanal v0.0.0-20190507123206-ceab60083e70/go.mod h1:OiuWIClssf5WzbMcR8lfspdBVaP+vRQndY4kHeFgrDw=
+github.com/knqyf263/fanal v0.0.0-20190514052804-ca40e6cb0e1a h1:2zG9YY77/Nv+dMcAA3EzRwoUWP0cWmQIuAumhEYZtNQ=
+github.com/knqyf263/fanal v0.0.0-20190514052804-ca40e6cb0e1a/go.mod h1:HTp1oNm2dPtIooJCspQHukx37GjPpj5DHuqlebTp4TI=
 github.com/knqyf263/go-deb-version v0.0.0-20170509080151-9865fe14d09b h1:DiDMmSwuY27PJxA2Gs0+uI/bQ/ehKARaGXRdlp+wFis=
 github.com/knqyf263/go-deb-version v0.0.0-20170509080151-9865fe14d09b/go.mod h1:o8sgWoz3JADecfc/cTYD92/Et1yMqMy0utV1z+VaZao=
-github.com/knqyf263/go-dep-parser v0.0.0-20190429154931-c377a5391790 h1:c02gG0yRNr25lcLOH+678SuuxxMUq36i48PQnmAweWk=
-github.com/knqyf263/go-dep-parser v0.0.0-20190429154931-c377a5391790/go.mod h1:CtT+dtv38jSz5EYYCX21LgtVXP+J3soF2fzQT8lHCfY=
+github.com/knqyf263/go-dep-parser v0.0.0-20190511063217-d5d543bfc261 h1:RPgPsbEsYj6LuOjZnKl2DvbfodNWRuWKZfWJkrD7l8s=
+github.com/knqyf263/go-dep-parser v0.0.0-20190511063217-d5d543bfc261/go.mod h1:gSiqSkOFPstUZu/qZ4wnNJS69PtQQnPl397vxKHJ5mQ=
 github.com/knqyf263/go-rpm-version v0.0.0-20170716094938-74609b86c936 h1:HDjRqotkViMNcGMGicb7cgxklx8OwnjtCBmyWEqrRvM=
 github.com/knqyf263/go-rpm-version v0.0.0-20170716094938-74609b86c936/go.mod h1:i4sF0l1fFnY1aiw08QQSwVAFxHEm311Me3WsU/X7nL0=
 github.com/knqyf263/go-rpmdb v0.0.0-20190501070121-10a1c42a10dc/go.mod h1:MrSSvdMpTSymaQWk1yFr9sxFSyQmKMj6jkbvGrchBV8=
@@ -155,8 +152,6 @@ github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/olekukonko/tablewriter v0.0.1 h1:b3iUnf1v+ppJiOfNX4yxxqfWKMQPZR5yoh8urCTFX88=
-github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.2/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
--- a/imgs/alpine_comparison.png
+++ b/imgs/alpine_comparison.png
--- a/imgs/logo.png
+++ b/imgs/logo.png
--- a/imgs/usage.gif
+++ b/imgs/usage.gif
--- a/pkg/remic/run.go
+++ b/pkg/remic/run.go
@@ -1,85 +0,0 @@
-package remic
-
-import (
-	l "log"
-	"os"
-	"strings"
-
-	"github.com/knqyf263/trivy/pkg/scanner"
-
-	"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability"
-
-	"github.com/knqyf263/trivy/pkg/vulnsrc"
-
-	"github.com/urfave/cli"
-	"golang.org/x/xerrors"
-
-	"github.com/knqyf263/trivy/pkg/db"
-	"github.com/knqyf263/trivy/pkg/log"
-	"github.com/knqyf263/trivy/pkg/report"
-)
-
-func Run(c *cli.Context) (err error) {
-	debug := c.Bool("debug")
-	if err = log.InitLogger(debug); err != nil {
-		l.Fatal(err)
-	}
-
-	args := c.Args()
-	if len(args) == 0 {
-		return xerrors.New(`remic" requires at least 1 argument.`)
-	}
-
-	o := c.String("output")
-	output := os.Stdout
-	if o != "" {
-		if output, err = os.Create(o); err != nil {
-			return err
-		}
-	}
-
-	var severities []vulnerability.Severity
-	for _, s := range strings.Split(c.String("severity"), ",") {
-		severity, err := vulnerability.NewSeverity(s)
-		if err != nil {
-			return err
-		}
-		severities = append(severities, severity)
-	}
-
-	if err = db.Init(); err != nil {
-		return err
-	}
-
-	if err = vulnsrc.Update(); err != nil {
-		return err
-	}
-
-	fileName := args[0]
-	f, err := os.Open(fileName)
-	if err != nil {
-		return xerrors.Errorf("failed to open a file: %w", err)
-	}
-	defer f.Close()
-
-	result, err := scanner.ScanFile(f, severities)
-	if err != nil {
-		return xerrors.Errorf("failed to scan a file: %w", err)
-	}
-
-	var writer report.Writer
-	switch c.String("format") {
-	case "table":
-		writer = &report.TableWriter{Output: output}
-	case "json":
-		writer = &report.JsonWriter{Output: output}
-	default:
-		return xerrors.New("unknown format")
-	}
-
-	if err = writer.Write([]report.Result{result}); err != nil {
-		return xerrors.Errorf("failed to write results: %w", err)
-	}
-
-	return nil
-}
--- a/pkg/report/writer.go
+++ b/pkg/report/writer.go
@@ -10,7 +10,6 @@ import (

 	"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability"

-	"github.com/knqyf263/trivy/pkg/types"
 	"github.com/olekukonko/tablewriter"
 )

@@ -18,7 +17,7 @@ type Results []Result

 type Result struct {
 	FileName        string `json:"file"`
-	Vulnerabilities []types.Vulnerability
+	Vulnerabilities []vulnerability.DetectedVulnerability
 }

 type Writer interface {
@@ -80,7 +79,7 @@ type JsonWriter struct {
 }

 func (jw JsonWriter) Write(results Results) error {
-	out := map[string][]types.Vulnerability{}
+	out := map[string][]vulnerability.DetectedVulnerability{}
 	for _, result := range results {
 		out[result.FileName] = result.Vulnerabilities
 	}
--- a/pkg/run.go
+++ b/pkg/run.go
@@ -31,9 +31,8 @@ func Run(c *cli.Context) (err error) {
 	}
 	log.Logger.Debugf("cache dir:  %s", utils.CacheDir())

-	clean := c.Bool("clean")
-	if clean {
-		log.Logger.Info("Cleaning caches...")
+	if c.Bool("reset") {
+		log.Logger.Info("Resetting...")
 		if err = cache.Clear(); err != nil {
 			return xerrors.New("failed to remove image layer cache")
 		}
@@ -43,6 +42,13 @@ func Run(c *cli.Context) (err error) {
 		return nil
 	}

+	if c.Bool("clear-cache") {
+		log.Logger.Info("Removing image caches...")
+		if err = cache.Clear(); err != nil {
+			return xerrors.New("failed to remove image layer cache")
+		}
+	}
+
 	args := c.Args()
 	filePath := c.String("input")
 	if filePath == "" && len(args) == 0 {
@@ -98,11 +104,19 @@ func Run(c *cli.Context) (err error) {
 	if filePath == "" {
 		imageName = args[0]
 	}
-	results, err := scanner.ScanImage(imageName, filePath, severities, ignoreUnfixed)
+	vulns, err := scanner.ScanImage(imageName, filePath)
 	if err != nil {
 		return xerrors.Errorf("error in image scan: %w", err)
 	}

+	var results report.Results
+	for path, vuln := range vulns {
+		results = append(results, report.Result{
+			FileName:        path,
+			Vulnerabilities: vulnerability.FillAndFilter(vuln, severities, ignoreUnfixed),
+		})
+	}
+
 	var writer report.Writer
 	switch c.String("format") {
 	case "table":
--- a/pkg/scanner/library/bundler/scan.go
+++ b/pkg/scanner/library/bundler/scan.go
@@ -5,11 +5,12 @@ import (
 	"os"
 	"strings"

+	"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability"
+
 	"github.com/knqyf263/go-dep-parser/pkg/bundler"
 	ptypes "github.com/knqyf263/go-dep-parser/pkg/types"
 	"github.com/knqyf263/go-version"
 	"github.com/knqyf263/trivy/pkg/scanner/utils"
-	"github.com/knqyf263/trivy/pkg/types"
 	"golang.org/x/xerrors"
 )

@@ -25,8 +26,8 @@ func NewScanner() *Scanner {
 	return &Scanner{}
 }

-func (s *Scanner) Detect(pkgName string, pkgVer *version.Version) ([]types.Vulnerability, error) {
-	var vulns []types.Vulnerability
+func (s *Scanner) Detect(pkgName string, pkgVer *version.Version) ([]vulnerability.DetectedVulnerability, error) {
+	var vulns []vulnerability.DetectedVulnerability
 	for _, advisory := range s.db[pkgName] {
 		if utils.MatchVersions(pkgVer, advisory.PatchedVersions) {
 			continue
@@ -42,7 +43,7 @@ func (s *Scanner) Detect(pkgName string, pkgVer *version.Version) ([]types.Vulne
 			vulnerabilityID = fmt.Sprintf("OSVDB-%s", advisory.Osvdb)
 		}

-		vuln := types.Vulnerability{
+		vuln := vulnerability.DetectedVulnerability{
 			VulnerabilityID:  vulnerabilityID,
 			PkgName:          strings.TrimSpace(advisory.Gem),
 			Title:            strings.TrimSpace(advisory.Title),
--- a/pkg/scanner/library/cargo/advisory.go
+++ b/pkg/scanner/library/cargo/advisory.go
@@ -0,0 +1,111 @@
+package cargo
+
+import (
+	"io/ioutil"
+	"os"
+	"path/filepath"
+
+	"github.com/BurntSushi/toml"
+
+	"github.com/etcd-io/bbolt"
+
+	"github.com/knqyf263/trivy/pkg/db"
+	"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability"
+
+	"golang.org/x/xerrors"
+
+	"github.com/knqyf263/trivy/pkg/git"
+	"github.com/knqyf263/trivy/pkg/utils"
+)
+
+const (
+	dbURL = "https://github.com/RustSec/advisory-db.git"
+)
+
+var (
+	repoPath = filepath.Join(utils.CacheDir(), "rust-advisory-db")
+)
+
+type AdvisoryDB map[string][]Lockfile
+
+type Lockfile struct {
+	Advisory `toml:"advisory"`
+}
+
+type Advisory struct {
+	Id                string
+	Package           string
+	Title             string `toml:"title"`
+	Url               string
+	Date              string
+	Description       string
+	Keywords          []string
+	PatchedVersions   []string `toml:"patched_versions"`
+	AffectedFunctions []string `toml:"affected_functions"`
+}
+
+func (s *Scanner) UpdateDB() (err error) {
+	if _, err := git.CloneOrPull(dbURL, repoPath); err != nil {
+		return xerrors.Errorf("error in %s security DB update: %w", s.Type(), err)
+	}
+	s.db, err = s.walk()
+	return err
+}
+
+func (s *Scanner) walk() (AdvisoryDB, error) {
+	advisoryDB := AdvisoryDB{}
+	root := filepath.Join(repoPath, "crates")
+
+	var vulns []vulnerability.Vulnerability
+	err := filepath.Walk(root, func(path string, info os.FileInfo, err error) error {
+		if info.IsDir() {
+			return nil
+		}
+		buf, err := ioutil.ReadFile(path)
+		if err != nil {
+			return xerrors.Errorf("failed to read a file: %w", err)
+		}
+
+		advisory := Lockfile{}
+		err = toml.Unmarshal(buf, &advisory)
+		if err != nil {
+			return xerrors.Errorf("failed to unmarshal TOML: %w", err)
+		}
+
+		// for detecting vulnerabilities
+		advisories, ok := advisoryDB[advisory.Package]
+		if !ok {
+			advisories = []Lockfile{}
+		}
+		advisoryDB[advisory.Package] = append(advisories, advisory)
+
+		// for displaying vulnerability detail
+		vulns = append(vulns, vulnerability.Vulnerability{
+			ID:          advisory.Id,
+			References:  []string{advisory.Url},
+			Title:       advisory.Title,
+			Description: advisory.Description,
+		})
+
+		return nil
+	})
+	if err != nil {
+		return nil, xerrors.Errorf("error in file walk: %w", err)
+	}
+
+	if err = s.saveVulnerabilities(vulns); err != nil {
+		return nil, err
+	}
+	return advisoryDB, nil
+}
+
+func (s *Scanner) saveVulnerabilities(vulns []vulnerability.Vulnerability) error {
+	return vulnerability.BatchUpdate(func(b *bbolt.Bucket) error {
+		for _, vuln := range vulns {
+			if err := db.Put(b, vuln.ID, vulnerability.RustSec, vuln); err != nil {
+				return xerrors.Errorf("failed to save %s vulnerability: %w", s.Type(), err)
+			}
+		}
+		return nil
+	})
+}
--- a/pkg/scanner/library/cargo/scan.go
+++ b/pkg/scanner/library/cargo/scan.go
@@ -0,0 +1,57 @@
+package cargo
+
+import (
+	"os"
+	"strings"
+
+	"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability"
+
+	"github.com/knqyf263/go-dep-parser/pkg/cargo"
+	ptypes "github.com/knqyf263/go-dep-parser/pkg/types"
+	"github.com/knqyf263/go-version"
+	"github.com/knqyf263/trivy/pkg/scanner/utils"
+	"golang.org/x/xerrors"
+)
+
+const (
+	scannerType = "cargo"
+)
+
+type Scanner struct {
+	db AdvisoryDB
+}
+
+func NewScanner() *Scanner {
+	return &Scanner{}
+}
+
+func (s *Scanner) Detect(pkgName string, pkgVer *version.Version) ([]vulnerability.DetectedVulnerability, error) {
+	var vulns []vulnerability.DetectedVulnerability
+	for _, advisory := range s.db[pkgName] {
+		if utils.MatchVersions(pkgVer, advisory.PatchedVersions) {
+			continue
+		}
+
+		vuln := vulnerability.DetectedVulnerability{
+			VulnerabilityID:  advisory.Id,
+			PkgName:          strings.TrimSpace(advisory.Package),
+			Title:            strings.TrimSpace(advisory.Title),
+			InstalledVersion: pkgVer.String(),
+			FixedVersion:     strings.Join(advisory.PatchedVersions, ", "),
+		}
+		vulns = append(vulns, vuln)
+	}
+	return vulns, nil
+}
+
+func (s *Scanner) ParseLockfile(f *os.File) ([]ptypes.Library, error) {
+	libs, err := cargo.Parse(f)
+	if err != nil {
+		return nil, xerrors.Errorf("invalid Cargo.lock format: %w", err)
+	}
+	return libs, nil
+}
+
+func (s *Scanner) Type() string {
+	return scannerType
+}
--- a/pkg/scanner/library/composer/scan.go
+++ b/pkg/scanner/library/composer/scan.go
@@ -5,13 +5,14 @@ import (
 	"os"
 	"strings"

+	"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability"
+
 	"golang.org/x/xerrors"

 	"github.com/knqyf263/go-dep-parser/pkg/composer"
 	ptypes "github.com/knqyf263/go-dep-parser/pkg/types"
 	"github.com/knqyf263/go-version"
 	"github.com/knqyf263/trivy/pkg/scanner/utils"
-	"github.com/knqyf263/trivy/pkg/types"
 )

 const (
@@ -26,8 +27,8 @@ func NewScanner() *Scanner {
 	return &Scanner{}
 }

-func (s *Scanner) Detect(pkgName string, pkgVer *version.Version) ([]types.Vulnerability, error) {
-	var vulns []types.Vulnerability
+func (s *Scanner) Detect(pkgName string, pkgVer *version.Version) ([]vulnerability.DetectedVulnerability, error) {
+	var vulns []vulnerability.DetectedVulnerability
 	ref := fmt.Sprintf("composer://%s", pkgName)
 	for _, advisory := range s.db[ref] {
 		var affectedVersions []string
@@ -45,7 +46,7 @@ func (s *Scanner) Detect(pkgName string, pkgVer *version.Version) ([]types.Vulne
 			continue
 		}

-		vuln := types.Vulnerability{
+		vuln := vulnerability.DetectedVulnerability{
 			VulnerabilityID:  advisory.Cve,
 			PkgName:          pkgName,
 			Title:            strings.TrimSpace(advisory.Title),
--- a/pkg/scanner/library/npm/scan.go
+++ b/pkg/scanner/library/npm/scan.go
@@ -5,13 +5,14 @@ import (
 	"os"
 	"strings"

+	"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability"
+
 	"golang.org/x/xerrors"

 	"github.com/knqyf263/go-dep-parser/pkg/npm"
 	ptypes "github.com/knqyf263/go-dep-parser/pkg/types"
 	"github.com/knqyf263/go-version"
 	"github.com/knqyf263/trivy/pkg/scanner/utils"
-	"github.com/knqyf263/trivy/pkg/types"
 )

 const (
@@ -26,9 +27,9 @@ func NewScanner() *Scanner {
 	return &Scanner{}
 }

-func (s *Scanner) Detect(pkgName string, pkgVer *version.Version) ([]types.Vulnerability, error) {
+func (s *Scanner) Detect(pkgName string, pkgVer *version.Version) ([]vulnerability.DetectedVulnerability, error) {
 	replacer := strings.NewReplacer(".alpha", "-alpha", ".beta", "-beta", ".rc", "-rc", " <", ", <", " >", ", >")
-	var vulns []types.Vulnerability
+	var vulns []vulnerability.DetectedVulnerability
 	for _, advisory := range s.db[pkgName] {
 		// e.g. <= 2.15.0 || >= 3.0.0 <= 3.8.2
 		//  => {"<=2.15.0", ">= 3.0.0, <= 3.8.2"}
@@ -57,7 +58,7 @@ func (s *Scanner) Detect(pkgName string, pkgVer *version.Version) ([]types.Vulne
 		}

 		for _, cveID := range advisory.Cves {
-			vuln := types.Vulnerability{
+			vuln := vulnerability.DetectedVulnerability{
 				VulnerabilityID:  cveID,
 				PkgName:          pkgName,
 				Title:            strings.TrimSpace(advisory.Title),
--- a/pkg/scanner/library/pipenv/scan.go
+++ b/pkg/scanner/library/pipenv/scan.go
@@ -4,13 +4,14 @@ import (
 	"os"
 	"strings"

+	"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability"
+
 	"golang.org/x/xerrors"

 	"github.com/knqyf263/go-dep-parser/pkg/pipenv"
 	ptypes "github.com/knqyf263/go-dep-parser/pkg/types"
 	"github.com/knqyf263/go-version"
 	"github.com/knqyf263/trivy/pkg/scanner/utils"
-	"github.com/knqyf263/trivy/pkg/types"
 )

 const (
@@ -25,8 +26,8 @@ func NewScanner() *Scanner {
 	return &Scanner{}
 }

-func (s *Scanner) Detect(pkgName string, pkgVer *version.Version) ([]types.Vulnerability, error) {
-	var vulns []types.Vulnerability
+func (s *Scanner) Detect(pkgName string, pkgVer *version.Version) ([]vulnerability.DetectedVulnerability, error) {
+	var vulns []vulnerability.DetectedVulnerability
 	for _, advisory := range s.db[pkgName] {
 		if !utils.MatchVersions(pkgVer, advisory.Specs) {
 			continue
@@ -37,7 +38,7 @@ func (s *Scanner) Detect(pkgName string, pkgVer *version.Version) ([]types.Vulne
 			vulnerabilityID = advisory.ID
 		}

-		vuln := types.Vulnerability{
+		vuln := vulnerability.DetectedVulnerability{
 			VulnerabilityID:  vulnerabilityID,
 			PkgName:          pkgName,
 			Title:            strings.TrimSpace(advisory.Advisory),
--- a/pkg/scanner/library/scan.go
+++ b/pkg/scanner/library/scan.go
@@ -4,8 +4,11 @@ import (
 	"os"
 	"path/filepath"

+	"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability"
+
 	"github.com/knqyf263/fanal/analyzer"
 	_ "github.com/knqyf263/fanal/analyzer/library/bundler"
+	_ "github.com/knqyf263/fanal/analyzer/library/cargo"
 	_ "github.com/knqyf263/fanal/analyzer/library/composer"
 	_ "github.com/knqyf263/fanal/analyzer/library/npm"
 	_ "github.com/knqyf263/fanal/analyzer/library/pipenv"
@@ -14,17 +17,17 @@ import (
 	"github.com/knqyf263/go-version"
 	"github.com/knqyf263/trivy/pkg/log"
 	"github.com/knqyf263/trivy/pkg/scanner/library/bundler"
+	"github.com/knqyf263/trivy/pkg/scanner/library/cargo"
 	"github.com/knqyf263/trivy/pkg/scanner/library/composer"
 	"github.com/knqyf263/trivy/pkg/scanner/library/npm"
 	"github.com/knqyf263/trivy/pkg/scanner/library/pipenv"
-	"github.com/knqyf263/trivy/pkg/types"
 	"golang.org/x/xerrors"
 )

 type Scanner interface {
 	UpdateDB() error
 	ParseLockfile(*os.File) ([]ptypes.Library, error)
-	Detect(string, *version.Version) ([]types.Vulnerability, error)
+	Detect(string, *version.Version) ([]vulnerability.DetectedVulnerability, error)
 	Type() string
 }

@@ -33,6 +36,8 @@ func NewScanner(filename string) Scanner {
 	switch filename {
 	case "Gemfile.lock":
 		scanner = bundler.NewScanner()
+	case "Cargo.lock":
+		scanner = cargo.NewScanner()
 	case "composer.lock":
 		scanner = composer.NewScanner()
 	case "package-lock.json":
@@ -45,13 +50,13 @@ func NewScanner(filename string) Scanner {
 	return scanner
 }

-func Scan(files extractor.FileMap) (map[string][]types.Vulnerability, error) {
+func Scan(files extractor.FileMap) (map[string][]vulnerability.DetectedVulnerability, error) {
 	results, err := analyzer.GetLibraries(files)
 	if err != nil {
 		return nil, xerrors.Errorf("failed to analyze libraries: %w", err)
 	}

-	vulnerabilities := map[string][]types.Vulnerability{}
+	vulnerabilities := map[string][]vulnerability.DetectedVulnerability{}
 	for path, pkgs := range results {
 		log.Logger.Debugf("Detecting library vulnerabilities, path: %s", path)
 		scanner := NewScanner(filepath.Base(string(path)))
@@ -71,8 +76,8 @@ func Scan(files extractor.FileMap) (map[string][]types.Vulnerability, error) {
 	return vulnerabilities, nil
 }

-func ScanFile(f *os.File) ([]types.Vulnerability, error) {
-	scanner := NewScanner(f.Name())
+func ScanFile(f *os.File) ([]vulnerability.DetectedVulnerability, error) {
+	scanner := NewScanner(filepath.Base(f.Name()))
 	if scanner == nil {
 		return nil, xerrors.New("unknown file type")
 	}
@@ -89,7 +94,7 @@ func ScanFile(f *os.File) ([]types.Vulnerability, error) {
 	return vulns, nil
 }

-func scan(scanner Scanner, pkgs []ptypes.Library) ([]types.Vulnerability, error) {
+func scan(scanner Scanner, pkgs []ptypes.Library) ([]vulnerability.DetectedVulnerability, error) {
 	log.Logger.Infof("Updating %s Security DB...", scanner.Type())
 	err := scanner.UpdateDB()
 	if err != nil {
@@ -97,7 +102,7 @@ func scan(scanner Scanner, pkgs []ptypes.Library) ([]types.Vulnerability, error)
 	}

 	log.Logger.Infof("Detecting %s vulnerabilities...", scanner.Type())
-	var vulnerabilities []types.Vulnerability
+	var vulnerabilities []vulnerability.DetectedVulnerability
 	for _, pkg := range pkgs {
 		v, err := version.NewVersion(pkg.Version)
 		if err != nil {
--- a/pkg/scanner/ospkg/alpine/alpine.go
+++ b/pkg/scanner/ospkg/alpine/alpine.go
@@ -3,17 +3,17 @@ package alpine
 import (
 	"strings"

+	"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability"
+
 	"golang.org/x/xerrors"

+	version "github.com/knqyf263/go-rpm-version"
 	"github.com/knqyf263/trivy/pkg/scanner/utils"

-	"github.com/knqyf263/go-rpm-version"
-
 	"github.com/knqyf263/trivy/pkg/vulnsrc/alpine"

 	"github.com/knqyf263/fanal/analyzer"
 	"github.com/knqyf263/trivy/pkg/log"
-	"github.com/knqyf263/trivy/pkg/types"
 )

 type Scanner struct{}
@@ -22,15 +22,15 @@ func NewScanner() *Scanner {
 	return &Scanner{}
 }

-func (s *Scanner) Detect(osVer string, pkgs []analyzer.Package) ([]types.Vulnerability, error) {
+func (s *Scanner) Detect(osVer string, pkgs []analyzer.Package) ([]vulnerability.DetectedVulnerability, error) {
 	log.Logger.Info("Detecting Alpine vulnerabilities...")
 	if strings.Count(osVer, ".") > 1 {
 		osVer = osVer[:strings.LastIndex(osVer, ".")]
 	}
 	log.Logger.Debugf("alpine: os version: %s", osVer)
-	log.Logger.Debugf("alpine: the number of packages: %s", len(pkgs))
+	log.Logger.Debugf("alpine: the number of packages: %d", len(pkgs))

-	var vulns []types.Vulnerability
+	var vulns []vulnerability.DetectedVulnerability
 	for _, pkg := range pkgs {
 		advisories, err := alpine.Get(osVer, pkg.Name)
 		if err != nil {
@@ -43,7 +43,7 @@ func (s *Scanner) Detect(osVer string, pkgs []analyzer.Package) ([]types.Vulnera
 		for _, adv := range advisories {
 			fixedVersion := version.NewVersion(adv.FixedVersion)
 			if installedVersion.LessThan(fixedVersion) {
-				vuln := types.Vulnerability{
+				vuln := vulnerability.DetectedVulnerability{
 					VulnerabilityID:  adv.VulnerabilityID,
 					PkgName:          pkg.Name,
 					InstalledVersion: installed,
--- a/pkg/scanner/ospkg/debian/debian.go
+++ b/pkg/scanner/ospkg/debian/debian.go
@@ -3,14 +3,16 @@ package debian
 import (
 	"strings"

+	version "github.com/knqyf263/go-deb-version"
+
+	"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability"
+
 	"golang.org/x/xerrors"

-	"github.com/knqyf263/go-deb-version"
 	"github.com/knqyf263/trivy/pkg/scanner/utils"

 	"github.com/knqyf263/fanal/analyzer"
 	"github.com/knqyf263/trivy/pkg/log"
-	"github.com/knqyf263/trivy/pkg/types"
 	"github.com/knqyf263/trivy/pkg/vulnsrc/debian"
 	debianoval "github.com/knqyf263/trivy/pkg/vulnsrc/debian-oval"
 )
@@ -21,7 +23,7 @@ func NewScanner() *Scanner {
 	return &Scanner{}
 }

-func (s *Scanner) Detect(osVer string, pkgs []analyzer.Package) ([]types.Vulnerability, error) {
+func (s *Scanner) Detect(osVer string, pkgs []analyzer.Package) ([]vulnerability.DetectedVulnerability, error) {
 	log.Logger.Info("Detecting Debian vulnerabilities...")

 	if strings.Count(osVer, ".") > 0 {
@@ -30,17 +32,14 @@ func (s *Scanner) Detect(osVer string, pkgs []analyzer.Package) ([]types.Vulnera
 	log.Logger.Debugf("debian: os version: %s", osVer)
 	log.Logger.Debugf("debian: the number of packages: %s", len(pkgs))

-	var vulns []types.Vulnerability
+	var vulns []vulnerability.DetectedVulnerability
 	for _, pkg := range pkgs {
-		if pkg.Type != analyzer.TypeSource {
-			continue
-		}
-		advisories, err := debianoval.Get(osVer, pkg.Name)
+		advisories, err := debianoval.Get(osVer, pkg.SrcName)
 		if err != nil {
 			return nil, xerrors.Errorf("failed to get debian OVAL: %w", err)
 		}

-		installed := utils.FormatVersion(pkg)
+		installed := utils.FormatSrcVersion(pkg)
 		installedVersion, err := version.NewVersion(installed)
 		if err != nil {
 			log.Logger.Debugf("failed to parse Debian installed package version: %w", err)
@@ -55,7 +54,7 @@ func (s *Scanner) Detect(osVer string, pkgs []analyzer.Package) ([]types.Vulnera
 			}

 			if installedVersion.LessThan(fixedVersion) {
-				vuln := types.Vulnerability{
+				vuln := vulnerability.DetectedVulnerability{
 					VulnerabilityID:  adv.VulnerabilityID,
 					PkgName:          pkg.Name,
 					InstalledVersion: installed,
@@ -64,12 +63,12 @@ func (s *Scanner) Detect(osVer string, pkgs []analyzer.Package) ([]types.Vulnera
 				vulns = append(vulns, vuln)
 			}
 		}
-		advisories, err = debian.Get(osVer, pkg.Name)
+		advisories, err = debian.Get(osVer, pkg.SrcName)
 		if err != nil {
 			return nil, xerrors.Errorf("failed to get debian advisory: %w", err)
 		}
 		for _, adv := range advisories {
-			vuln := types.Vulnerability{
+			vuln := vulnerability.DetectedVulnerability{
 				VulnerabilityID:  adv.VulnerabilityID,
 				PkgName:          pkg.Name,
 				InstalledVersion: installed,
--- a/pkg/scanner/ospkg/redhat/redhat.go
+++ b/pkg/scanner/ospkg/redhat/redhat.go
@@ -3,16 +3,13 @@ package redhat
 import (
 	"strings"

-	"golang.org/x/xerrors"
-
-	"github.com/knqyf263/trivy/pkg/scanner/utils"
-
-	"github.com/knqyf263/go-rpm-version"
-
 	"github.com/knqyf263/fanal/analyzer"
+	version "github.com/knqyf263/go-rpm-version"
 	"github.com/knqyf263/trivy/pkg/log"
-	"github.com/knqyf263/trivy/pkg/types"
+	"github.com/knqyf263/trivy/pkg/scanner/utils"
 	"github.com/knqyf263/trivy/pkg/vulnsrc/redhat"
+	"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability"
+	"golang.org/x/xerrors"
 )

 type Scanner struct{}
@@ -21,7 +18,7 @@ func NewScanner() *Scanner {
 	return &Scanner{}
 }

-func (s *Scanner) Detect(osVer string, pkgs []analyzer.Package) ([]types.Vulnerability, error) {
+func (s *Scanner) Detect(osVer string, pkgs []analyzer.Package) ([]vulnerability.DetectedVulnerability, error) {
 	log.Logger.Info("Detecting RHEL/CentOS vulnerabilities...")
 	if strings.Count(osVer, ".") > 0 {
 		osVer = osVer[:strings.Index(osVer, ".")]
@@ -29,25 +26,27 @@ func (s *Scanner) Detect(osVer string, pkgs []analyzer.Package) ([]types.Vulnera
 	log.Logger.Debugf("redhat: os version: %s", osVer)
 	log.Logger.Debugf("redhat: the number of packages: %s", len(pkgs))

-	var vulns []types.Vulnerability
+	var vulns []vulnerability.DetectedVulnerability
 	for _, pkg := range pkgs {
-		advisories, err := redhat.Get(osVer, pkg.Name)
+		advisories, err := redhat.Get(osVer, pkg.SrcName)
 		if err != nil {
 			return nil, xerrors.Errorf("failed to get Red Hat advisories: %w", err)
 		}

-		installed := utils.FormatVersion(pkg)
+		installed := utils.FormatSrcVersion(pkg)
 		installedVersion := version.NewVersion(installed)
 		for _, adv := range advisories {
 			fixedVersion := version.NewVersion(adv.FixedVersion)

+			vuln := vulnerability.DetectedVulnerability{
+				VulnerabilityID:  adv.VulnerabilityID,
+				PkgName:          pkg.Name,
+				InstalledVersion: installed,
+			}
 			if installedVersion.LessThan(fixedVersion) {
-				vuln := types.Vulnerability{
-					VulnerabilityID:  adv.VulnerabilityID,
-					PkgName:          pkg.Name,
-					InstalledVersion: installed,
-					FixedVersion:     adv.FixedVersion,
-				}
+				vuln.FixedVersion = adv.FixedVersion
+				vulns = append(vulns, vuln)
+			} else if adv.FixedVersion == "" {
 				vulns = append(vulns, vuln)
 			}
 		}
--- a/pkg/scanner/ospkg/scan.go
+++ b/pkg/scanner/ospkg/scan.go
@@ -2,6 +2,7 @@ package ospkg

 import (
 	"github.com/knqyf263/fanal/analyzer"
+	_ "github.com/knqyf263/fanal/analyzer/command/apk"
 	fos "github.com/knqyf263/fanal/analyzer/os"
 	_ "github.com/knqyf263/fanal/analyzer/os/alpine"
 	_ "github.com/knqyf263/fanal/analyzer/os/debianbase"
@@ -14,15 +15,15 @@ import (
 	"github.com/knqyf263/trivy/pkg/scanner/ospkg/debian"
 	"github.com/knqyf263/trivy/pkg/scanner/ospkg/redhat"
 	"github.com/knqyf263/trivy/pkg/scanner/ospkg/ubuntu"
-	"github.com/knqyf263/trivy/pkg/types"
+	"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability"
 	"golang.org/x/xerrors"
 )

 type Scanner interface {
-	Detect(string, []analyzer.Package) ([]types.Vulnerability, error)
+	Detect(string, []analyzer.Package) ([]vulnerability.DetectedVulnerability, error)
 }

-func Scan(files extractor.FileMap) (string, string, []types.Vulnerability, error) {
+func Scan(files extractor.FileMap) (string, string, []vulnerability.DetectedVulnerability, error) {
 	os, err := analyzer.GetOS(files)
 	if err != nil {
 		return "", "", nil, xerrors.Errorf("failed to analyze OS: %w", err)
@@ -48,6 +49,15 @@ func Scan(files extractor.FileMap) (string, string, []types.Vulnerability, error
 	}
 	log.Logger.Debugf("the number of packages: %d", len(pkgs))

+	pkgsFromCommands, err := analyzer.GetPackagesFromCommands(os, files)
+	if err != nil {
+		return "", "", nil, xerrors.Errorf("failed to analyze OS packages: %w", err)
+	}
+	log.Logger.Debugf("the number of packages from commands: %d", len(pkgsFromCommands))
+
+	pkgs = mergePkgs(pkgs, pkgsFromCommands)
+	log.Logger.Debugf("the number of packages: %d", len(pkgs))
+
 	vulns, err := s.Detect(os.Name, pkgs)
 	if err != nil {
 		return "", "", nil, xerrors.Errorf("failed to detect vulnerabilities: %w", err)
@@ -55,3 +65,17 @@ func Scan(files extractor.FileMap) (string, string, []types.Vulnerability, error

 	return os.Family, os.Name, vulns, nil
 }
+
+func mergePkgs(pkgs, pkgsFromCommands []analyzer.Package) []analyzer.Package {
+	uniqPkgs := map[string]struct{}{}
+	for _, pkg := range pkgs {
+		uniqPkgs[pkg.Name] = struct{}{}
+	}
+	for _, pkg := range pkgsFromCommands {
+		if _, ok := uniqPkgs[pkg.Name]; ok {
+			continue
+		}
+		pkgs = append(pkgs, pkg)
+	}
+	return pkgs
+}
--- a/pkg/scanner/ospkg/ubuntu/ubuntu.go
+++ b/pkg/scanner/ospkg/ubuntu/ubuntu.go
@@ -1,13 +1,13 @@
 package ubuntu

 import (
-	"github.com/knqyf263/go-deb-version"
+	version "github.com/knqyf263/go-deb-version"
 	"github.com/knqyf263/trivy/pkg/scanner/utils"
+	"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability"
 	"golang.org/x/xerrors"

 	"github.com/knqyf263/fanal/analyzer"
 	"github.com/knqyf263/trivy/pkg/log"
-	"github.com/knqyf263/trivy/pkg/types"
 	"github.com/knqyf263/trivy/pkg/vulnsrc/ubuntu"
 )

@@ -17,19 +17,19 @@ func NewScanner() *Scanner {
 	return &Scanner{}
 }

-func (s *Scanner) Detect(osVer string, pkgs []analyzer.Package) ([]types.Vulnerability, error) {
+func (s *Scanner) Detect(osVer string, pkgs []analyzer.Package) ([]vulnerability.DetectedVulnerability, error) {
 	log.Logger.Info("Detecting Ubuntu vulnerabilities...")
 	log.Logger.Debugf("ubuntu: os version: %s", osVer)
 	log.Logger.Debugf("ubuntu: the number of packages: %s", len(pkgs))

-	var vulns []types.Vulnerability
+	var vulns []vulnerability.DetectedVulnerability
 	for _, pkg := range pkgs {
-		advisories, err := ubuntu.Get(osVer, pkg.Name)
+		advisories, err := ubuntu.Get(osVer, pkg.SrcName)
 		if err != nil {
 			return nil, xerrors.Errorf("failed to get Ubuntu advisories: %w", err)
 		}

-		installed := utils.FormatVersion(pkg)
+		installed := utils.FormatSrcVersion(pkg)
 		installedVersion, err := version.NewVersion(installed)
 		if err != nil {
 			log.Logger.Debugf("failed to parse Ubuntu installed package version: %w", err)
@@ -37,7 +37,7 @@ func (s *Scanner) Detect(osVer string, pkgs []analyzer.Package) ([]types.Vulnera
 		}

 		for _, adv := range advisories {
-			vuln := types.Vulnerability{
+			vuln := vulnerability.DetectedVulnerability{
 				VulnerabilityID:  adv.VulnerabilityID,
 				PkgName:          pkg.Name,
 				InstalledVersion: installed,
--- a/pkg/scanner/scan.go
+++ b/pkg/scanner/scan.go
@@ -5,38 +5,28 @@ import (
 	"flag"
 	"fmt"
 	"os"
-	"sort"
+
+	"golang.org/x/crypto/ssh/terminal"

 	"github.com/genuinetools/reg/registry"

 	"github.com/knqyf263/trivy/pkg/log"

-	"github.com/knqyf263/trivy/pkg/report"
-
 	"github.com/knqyf263/trivy/pkg/scanner/library"

 	"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability"

-	"github.com/knqyf263/trivy/pkg/types"
-
 	"github.com/knqyf263/trivy/pkg/scanner/ospkg"

-	"golang.org/x/crypto/ssh/terminal"
 	"golang.org/x/xerrors"

 	"github.com/knqyf263/fanal/analyzer"
 	"github.com/knqyf263/fanal/extractor"
 )

-var (
-	sources = []string{vulnerability.Nvd, vulnerability.RedHat, vulnerability.Debian,
-		vulnerability.DebianOVAL, vulnerability.Alpine, vulnerability.RubySec, vulnerability.PhpSecurityAdvisories,
-		vulnerability.NodejsSecurityWg, vulnerability.PythonSafetyDB}
-)
-
-func ScanImage(imageName, filePath string, severities []vulnerability.Severity, ignoreUnfixed bool) (report.Results, error) {
-	var results report.Results
+func ScanImage(imageName, filePath string) (map[string][]vulnerability.DetectedVulnerability, error) {
 	var err error
+	results := map[string][]vulnerability.DetectedVulnerability{}
 	ctx := context.Background()

 	image, err := registry.ParseImage(imageName)
@@ -72,70 +62,32 @@ func ScanImage(imageName, filePath string, severities []vulnerability.Severity,

 	osFamily, osVersion, osVulns, err := ospkg.Scan(files)
 	if err != nil {
-		return nil, xerrors.New("failed to scan image")
+		return nil, xerrors.Errorf("failed to scan image: %w", err)

 	}
-
-	results = append(results, report.Result{
-		FileName:        fmt.Sprintf("%s (%s %s)", target, osFamily, osVersion),
-		Vulnerabilities: processVulnerabilties(osVulns, severities, ignoreUnfixed),
-	})
+	imageDetail := fmt.Sprintf("%s (%s %s)", target, osFamily, osVersion)
+	results[imageDetail] = osVulns

 	libVulns, err := library.Scan(files)
 	if err != nil {
-		return nil, xerrors.New("failed to scan libraries")
+		return nil, xerrors.Errorf("failed to scan libraries: %w", err)
 	}
 	for path, vulns := range libVulns {
-		results = append(results, report.Result{
-			FileName:        path,
-			Vulnerabilities: processVulnerabilties(vulns, severities, ignoreUnfixed),
-		})
+		results[path] = vulns
 	}

 	return results, nil
 }

-func ScanFile(f *os.File, severities []vulnerability.Severity) (report.Result, error) {
+func ScanFile(f *os.File) (map[string][]vulnerability.DetectedVulnerability, error) {
 	vulns, err := library.ScanFile(f)
 	if err != nil {
-		return report.Result{}, xerrors.New("failed to scan libraries in file")
+		return nil, xerrors.Errorf("failed to scan libraries in file: %w", err)
 	}
-	result := report.Result{
-		FileName:        f.Name(),
-		Vulnerabilities: processVulnerabilties(vulns, severities, false),
+	results := map[string][]vulnerability.DetectedVulnerability{
+		f.Name(): vulns,
 	}
-	return result, nil
-}
-
-func processVulnerabilties(vulns []types.Vulnerability, severities []vulnerability.Severity, ignoreUnfixed bool) []types.Vulnerability {
-	var vulnerabilities []types.Vulnerability
-	for _, vuln := range vulns {
-		sev, title, description, references := getDetail(vuln.VulnerabilityID)
-
-		// Filter vulnerabilities by severity
-		for _, s := range severities {
-			if s == sev {
-				vuln.Severity = fmt.Sprint(sev)
-				vuln.Title = title
-				vuln.Description = description
-				vuln.References = references
-
-				// Ignore unfixed vulnerabilities
-				if ignoreUnfixed && vuln.FixedVersion == "" {
-					continue
-				}
-				vulnerabilities = append(vulnerabilities, vuln)
-				break
-			}
-		}
-	}
-	sort.Slice(vulnerabilities, func(i, j int) bool {
-		if vulnerabilities[i].PkgName != vulnerabilities[j].PkgName {
-			return vulnerabilities[i].PkgName < vulnerabilities[j].PkgName
-		}
-		return vulnerability.CompareSeverityString(vulnerabilities[j].Severity, vulnerabilities[i].Severity)
-	})
-	return vulnerabilities
+	return results, nil
 }

 func openStream(path string) (*os.File, error) {
@@ -149,90 +101,3 @@ func openStream(path string) (*os.File, error) {
 	}
 	return os.Open(path)
 }
-
-func getDetail(vulnID string) (vulnerability.Severity, string, string, []string) {
-	details, err := vulnerability.Get(vulnID)
-	if err != nil {
-		log.Logger.Debug(err)
-		return vulnerability.SeverityUnknown, "", "", nil
-	} else if len(details) == 0 {
-		return vulnerability.SeverityUnknown, "", "", nil
-	}
-	return getSeverity(details), getTitle(details), getDescription(details), getReferences(details)
-}
-
-func getSeverity(details map[string]vulnerability.Vulnerability) vulnerability.Severity {
-	for _, source := range sources {
-		d, ok := details[source]
-		if !ok {
-			continue
-		}
-		if d.Severity != 0 {
-			return d.Severity
-		} else if d.SeverityV3 != 0 {
-			return d.SeverityV3
-		} else if d.CvssScore > 0 {
-			return scoreToSeverity(d.CvssScore)
-		} else if d.CvssScoreV3 > 0 {
-			return scoreToSeverity(d.CvssScoreV3)
-		}
-	}
-	return vulnerability.SeverityUnknown
-}
-
-func getTitle(details map[string]vulnerability.Vulnerability) string {
-	for _, source := range sources {
-		d, ok := details[source]
-		if !ok {
-			continue
-		}
-		if d.Title != "" {
-			return d.Title
-		}
-	}
-	return ""
-}
-
-func getDescription(details map[string]vulnerability.Vulnerability) string {
-	for _, source := range sources {
-		d, ok := details[source]
-		if !ok {
-			continue
-		}
-		if d.Description != "" {
-			return d.Description
-		}
-	}
-	return ""
-}
-
-func getReferences(details map[string]vulnerability.Vulnerability) []string {
-	references := map[string]struct{}{}
-	for _, source := range sources {
-		d, ok := details[source]
-		if !ok {
-			continue
-		}
-		for _, ref := range d.References {
-			references[ref] = struct{}{}
-		}
-	}
-	var refs []string
-	for ref := range references {
-		refs = append(refs, ref)
-	}
-	return refs
-}
-
-func scoreToSeverity(score float64) vulnerability.Severity {
-	if score >= 9.0 {
-		return vulnerability.SeverityCritical
-	} else if score >= 7.0 {
-		return vulnerability.SeverityHigh
-	} else if score >= 4.0 {
-		return vulnerability.SeverityMedium
-	} else if score > 0.0 {
-		return vulnerability.SeverityLow
-	}
-	return vulnerability.SeverityUnknown
-}
--- a/pkg/scanner/utils/utils.go
+++ b/pkg/scanner/utils/utils.go
@@ -29,12 +29,21 @@ func MatchVersions(currentVersion *version.Version, rangeVersions []string) bool
 }

 func FormatVersion(pkg analyzer.Package) string {
-	v := pkg.Version
-	if pkg.Release != "" {
-		v = fmt.Sprintf("%s-%s", v, pkg.Release)
+	return formatVersion(pkg.Epoch, pkg.Version, pkg.Release)
+}
+
+func FormatSrcVersion(pkg analyzer.Package) string {
+	return formatVersion(pkg.SrcEpoch, pkg.SrcVersion, pkg.SrcRelease)
+}
+
+func formatVersion(epoch int, version, release string) string {
+	v := version
+	if release != "" {
+		v = fmt.Sprintf("%s-%s", v, release)
 	}
-	if pkg.Epoch != 0 {
-		v = fmt.Sprintf("%d:%s", pkg.Epoch, v)
+	if epoch != 0 {
+		v = fmt.Sprintf("%d:%s", epoch, v)
 	}
 	return v
+
 }
--- a/pkg/types/vulnerability.go
+++ b/pkg/types/vulnerability.go
@@ -1,13 +1 @@
 package types
-
-type Vulnerability struct {
-	VulnerabilityID  string
-	PkgName          string
-	InstalledVersion string
-	FixedVersion     string
-
-	Title       string
-	Description string
-	Severity    string
-	References  []string
-}
--- a/pkg/vulnsrc/nvd/nvd.go
+++ b/pkg/vulnsrc/nvd/nvd.go
@@ -77,6 +77,8 @@ func save(items []Item) error {
 			}

 			vuln := vulnerability.Vulnerability{
+				CvssScore:   item.Impact.BaseMetricV2.CvssV2.BaseScore,
+				CvssScoreV3: item.Impact.BaseMetricV3.CvssV3.BaseScore,
 				Severity:    severity,
 				SeverityV3:  severityV3,
 				References:  references,
--- a/pkg/vulnsrc/nvd/types.go
+++ b/pkg/vulnsrc/nvd/types.go
@@ -25,14 +25,20 @@ type Impact struct {
 }

 type BaseMetricV2 struct {
+	CvssV2   CvssV2
 	Severity string
 }

+type CvssV2 struct {
+	BaseScore float64
+}
+
 type BaseMetricV3 struct {
 	CvssV3 CvssV3
 }

 type CvssV3 struct {
+	BaseScore    float64
 	BaseSeverity string
 }

--- a/pkg/vulnsrc/vulnerability/const.go
+++ b/pkg/vulnsrc/vulnerability/const.go
@@ -12,6 +12,7 @@ const (
 	Amazon                = "amazon"
 	Alpine                = "alpine"
 	RubySec               = "ruby-advisory-db"
+	RustSec               = "rust-advisory-db"
 	PhpSecurityAdvisories = "php-security-advisories"
 	NodejsSecurityWg      = "nodejs-security-wg"
 	PythonSafetyDB        = "python-safety-db"
--- a/pkg/vulnsrc/vulnerability/db.go
+++ b/pkg/vulnsrc/vulnerability/db.go
@@ -0,0 +1,55 @@
+package vulnerability
+
+import (
+	"encoding/json"
+
+	bolt "github.com/etcd-io/bbolt"
+	"github.com/knqyf263/trivy/pkg/db"
+	"golang.org/x/xerrors"
+)
+
+const (
+	rootBucket = "vulnerability"
+)
+
+func Put(tx *bolt.Tx, cveID, source string, vuln Vulnerability) error {
+	root, err := tx.CreateBucketIfNotExists([]byte(rootBucket))
+	if err != nil {
+		return err
+	}
+	return db.Put(root, cveID, source, vuln)
+}
+
+func Update(cveID, source string, vuln Vulnerability) error {
+	return db.Update(rootBucket, cveID, source, vuln)
+}
+
+func BatchUpdate(fn func(b *bolt.Bucket) error) error {
+	return db.BatchUpdate(func(tx *bolt.Tx) error {
+		root, err := tx.CreateBucketIfNotExists([]byte(rootBucket))
+		if err != nil {
+			return err
+		}
+		return fn(root)
+	})
+}
+
+func Get(cveID string) (map[string]Vulnerability, error) {
+	values, err := db.ForEach(rootBucket, cveID)
+	if err != nil {
+		return nil, xerrors.Errorf("error in NVD get: %w", err)
+	}
+	if len(values) == 0 {
+		return nil, nil
+	}
+
+	vulns := map[string]Vulnerability{}
+	for source, value := range values {
+		var vuln Vulnerability
+		if err = json.Unmarshal(value, &vuln); err != nil {
+			return nil, xerrors.Errorf("failed to unmarshal Vulnerability JSON: %w", err)
+		}
+		vulns[source] = vuln
+	}
+	return vulns, nil
+}
--- a/pkg/vulnsrc/vulnerability/types.go
+++ b/pkg/vulnsrc/vulnerability/types.go
@@ -65,3 +65,30 @@ func (s Severity) String() string {
 type LastUpdated struct {
 	Date time.Time
 }
+type Vulnerability struct {
+	ID          string // e.g. CVE-2019-8331, OSVDB-104365
+	CvssScore   float64
+	CvssScoreV3 float64
+	Severity    Severity
+	SeverityV3  Severity
+	References  []string
+	Title       string
+	Description string
+}
+
+type Advisory struct {
+	VulnerabilityID string
+	FixedVersion    string
+}
+
+type DetectedVulnerability struct {
+	VulnerabilityID  string
+	PkgName          string
+	InstalledVersion string
+	FixedVersion     string
+
+	Title       string
+	Description string
+	Severity    string
+	References  []string
+}
--- a/pkg/vulnsrc/vulnerability/vulnerability.go
+++ b/pkg/vulnsrc/vulnerability/vulnerability.go
@@ -1,71 +1,164 @@
 package vulnerability

 import (
-	"encoding/json"
+	"bufio"
+	"fmt"
+	"os"
+	"strings"

-	bolt "github.com/etcd-io/bbolt"
-	"github.com/knqyf263/trivy/pkg/db"
-	"golang.org/x/xerrors"
+	"github.com/knqyf263/trivy/pkg/utils"
+
+	"sort"
+
+	"github.com/knqyf263/trivy/pkg/log"
 )

 const (
-	rootBucket = "vulnerability"
+	trivyIgnore = ".trivyignore"
 )

-type Vulnerability struct {
-	ID          string // e.g. CVE-2019-8331, OSVDB-104365
-	CvssScore   float64
-	CvssScoreV3 float64
-	Severity    Severity
-	SeverityV3  Severity
-	References  []string
-	Title       string
-	Description string
-}
+var (
+	sources = []string{Nvd, RedHat, Debian, DebianOVAL, Alpine,
+		RubySec, RustSec, PhpSecurityAdvisories, NodejsSecurityWg, PythonSafetyDB}
+)

-type Advisory struct {
-	VulnerabilityID string
-	FixedVersion    string
-}
+func FillAndFilter(vulns []DetectedVulnerability, severities []Severity, ignoreUnfixed bool) []DetectedVulnerability {
+	ignoredIDs := getIgnoredIDs()
+	var vulnerabilities []DetectedVulnerability
+	for _, vuln := range vulns {
+		sev, title, description, references := getDetail(vuln.VulnerabilityID)

-func Put(tx *bolt.Tx, cveID, source string, vuln Vulnerability) error {
-	root, err := tx.CreateBucketIfNotExists([]byte(rootBucket))
-	if err != nil {
-		return err
-	}
-	return db.Put(root, cveID, source, vuln)
-}
+		// Filter vulnerabilities by severity
+		for _, s := range severities {
+			if s == sev {
+				vuln.Severity = fmt.Sprint(sev)
+				vuln.Title = title
+				vuln.Description = description
+				vuln.References = references

-func Update(cveID, source string, vuln Vulnerability) error {
-	return db.Update(rootBucket, cveID, source, vuln)
-}
-
-func BatchUpdate(fn func(b *bolt.Bucket) error) error {
-	return db.BatchUpdate(func(tx *bolt.Tx) error {
-		root, err := tx.CreateBucketIfNotExists([]byte(rootBucket))
-		if err != nil {
-			return err
+				// Ignore unfixed vulnerabilities
+				if ignoreUnfixed && vuln.FixedVersion == "" {
+					continue
+				} else if utils.StringInSlice(vuln.VulnerabilityID, ignoredIDs) {
+					continue
+				}
+				vulnerabilities = append(vulnerabilities, vuln)
+				break
+			}
 		}
-		return fn(root)
+	}
+	sort.Slice(vulnerabilities, func(i, j int) bool {
+		if vulnerabilities[i].PkgName != vulnerabilities[j].PkgName {
+			return vulnerabilities[i].PkgName < vulnerabilities[j].PkgName
+		}
+		return CompareSeverityString(vulnerabilities[j].Severity, vulnerabilities[i].Severity)
 	})
+	return vulnerabilities
 }

-func Get(cveID string) (map[string]Vulnerability, error) {
-	values, err := db.ForEach(rootBucket, cveID)
+func getIgnoredIDs() []string {
+	f, err := os.Open(trivyIgnore)
 	if err != nil {
-		return nil, xerrors.Errorf("error in NVD get: %w", err)
-	}
-	if len(values) == 0 {
-		return nil, nil
+		// trivy must work even if no .trivyignore exist
+		return nil
 	}

-	vulns := map[string]Vulnerability{}
-	for source, value := range values {
-		var vuln Vulnerability
-		if err = json.Unmarshal(value, &vuln); err != nil {
-			return nil, xerrors.Errorf("failed to unmarshal Vulnerability JSON: %w", err)
+	var ignoredIDs []string
+	scanner := bufio.NewScanner(f)
+	for scanner.Scan() {
+		line := scanner.Text()
+		line = strings.TrimSpace(line)
+		if strings.HasPrefix(line, "#") || line == "" {
+			continue
 		}
-		vulns[source] = vuln
+		ignoredIDs = append(ignoredIDs, line)
 	}
-	return vulns, nil
+	return ignoredIDs
+}
+
+func getDetail(vulnID string) (Severity, string, string, []string) {
+	details, err := Get(vulnID)
+	if err != nil {
+		log.Logger.Debug(err)
+		return SeverityUnknown, "", "", nil
+	} else if len(details) == 0 {
+		return SeverityUnknown, "", "", nil
+	}
+	return getSeverity(details), getTitle(details), getDescription(details), getReferences(details)
+}
+
+func getSeverity(details map[string]Vulnerability) Severity {
+	for _, source := range sources {
+		d, ok := details[source]
+		if !ok {
+			continue
+		}
+		if d.CvssScore > 0 {
+			return scoreToSeverity(d.CvssScore)
+		} else if d.CvssScoreV3 > 0 {
+			return scoreToSeverity(d.CvssScoreV3)
+		} else if d.Severity != 0 {
+			return d.Severity
+		} else if d.SeverityV3 != 0 {
+			return d.SeverityV3
+		}
+	}
+	return SeverityUnknown
+}
+
+func getTitle(details map[string]Vulnerability) string {
+	for _, source := range sources {
+		d, ok := details[source]
+		if !ok {
+			continue
+		}
+		if d.Title != "" {
+			return d.Title
+		}
+	}
+	return ""
+}
+
+func getDescription(details map[string]Vulnerability) string {
+	for _, source := range sources {
+		d, ok := details[source]
+		if !ok {
+			continue
+		}
+		if d.Description != "" {
+			return d.Description
+		}
+	}
+	return ""
+}
+
+func getReferences(details map[string]Vulnerability) []string {
+	references := map[string]struct{}{}
+	for _, source := range sources {
+		d, ok := details[source]
+		if !ok {
+			continue
+		}
+		for _, ref := range d.References {
+			references[ref] = struct{}{}
+		}
+	}
+	var refs []string
+	for ref := range references {
+		refs = append(refs, ref)
+	}
+	return refs
+}
+
+func scoreToSeverity(score float64) Severity {
+	if score >= 9.0 {
+		return SeverityCritical
+	} else if score >= 7.0 {
+		return SeverityHigh
+	} else if score >= 4.0 {
+		return SeverityMedium
+	} else if score > 0.0 {
+		return SeverityLow
+	}
+	return SeverityUnknown
 }
Author	SHA1	Message	Date
Teppei Fukuda	cfd85db900	Update LICENSE	2019-05-15 17:36:13 +09:00
knqyf263	948519d460	Update README	2019-05-15 13:20:12 +09:00
knqyf263	9a67f0d1a7	Add reset and clear-cache option	2019-05-14 18:48:55 +09:00
knqyf263	17b5a60247	Use src package	2019-05-14 16:44:23 +09:00
knqyf263	f42895465d	Update README	2019-05-14 16:44:21 +09:00
knqyf263	9006dd5d16	Update dependencies	2019-05-13 15:16:47 +09:00
knqyf263	27d776cdf2	Support .trivyignore	2019-05-13 13:56:01 +09:00
knqyf263	1827d3d5c9	Refactor	2019-05-13 10:04:01 +09:00
knqyf263	2b5782c920	Use NVD CVSS score	2019-05-13 04:11:51 +09:00
knqyf263	6284def316	Aanalyze commands	2019-05-13 04:11:34 +09:00
Masahiro	0c11078302	Add Cargo scanner (#5 )	2019-05-12 23:08:02 +09:00
knqyf263	507fac9284	Move remic	2019-05-11 14:45:52 +09:00
Masahiro	22abb9dab1	Add options for remic (#4 ) * Fix filename * Add options	2019-05-11 14:36:20 +09:00
knqyf263	6463176bc0	Update README	2019-05-08 19:14:48 +09:00