google · Dor1s · Mar 10, 2020 · Mar 6, 2020 · Mar 9, 2020 · Mar 9, 2020
diff --git a/docs/getting-started/new_project_guide.md b/docs/getting-started/new_project_guide.md
@@ -72,6 +72,7 @@ Once the template configuration files are created, you can modify them to fit yo
 This configuration file stores project metadata. The following attributes are supported:
 
 - [homepage](#homepage)
+- [language](#language)
 - [primary_contact](#primary)
 - [auto_ccs](#primary)
 - [vendor_ccs](#vendor) (optional)
@@ -82,6 +83,13 @@ This configuration file stores project metadata. The following attributes are su
 ### homepage
 You project's homepage.
 
+### language
+
+Programming language the project is written in. Most often this would be `c` or
+`c++`. Other values for this attribute are documented in language specific
+documentation pages (e.g.
+[Integrating a Go project]({{ site.baseurl }}//getting-started/new-project-guide/go-lang/)).
+
 ### primary_contact, auto_ccs {#primary}
 The primary contact and list of other contacts to be CCed. Each person listed gets access to ClusterFuzz, including crash reports and fuzzer statistics, and are auto-cced on new bugs filed in the OSS-Fuzz
 tracker. If you're a primary or a CC, you'll need to use a [Google account](https://support.google.com/accounts/answer/176347?hl=en) to get full access. ([why?]({{ site.baseurl }}/faq/#why-do-you-require-a-google-account-for-authentication)).

diff --git a/infra/presubmit.py b/infra/presubmit.py
@@ -92,9 +92,16 @@ class ProjectYamlChecker:
       'view_restrictions',
       'language',
       'help_url',
+      'labels',  # For internal use only, hard to lint as it uses fuzzer names.
+      'selective_unpack',
   ]
 
-  LANGUAGES_SUPPORTED = ['c', 'cpp', 'go', 'rust', 'python']
+  LANGUAGES_SUPPORTED = [
+      'c',
+      'c++',
+      'go',
+      'rust',
+  ]
 
   # Note that some projects like boost only have auto-ccs. However, forgetting
   # primary contact is probably a mistake.
@@ -188,14 +195,14 @@ def check_valid_emails(self):
         self.error(email_address + ' is an invalid email address.')
 
   def check_valid_language(self):
-    """Check that the language specified is valid."""
+    """Check that the language is specified and valid."""
     language = self.data.get('language')
     if not language:
-      return
-
-    if language not in self.LANGUAGES_SUPPORTED:
-      self.error('{language} is not supported ({supported}).'.format(
-          language=language, supported=self.LANGUAGES_SUPPORTED))
+      self.error('Missing "language" attribute in project.yaml.')
+    elif language not in self.LANGUAGES_SUPPORTED:
+      self.error(
+          '"language: {language}" is not supported ({supported}).'.format(
+              language=language, supported=self.LANGUAGES_SUPPORTED))
 
 
 def _check_one_project_yaml(project_yaml_filename):

diff --git a/infra/templates.py b/infra/templates.py
@@ -13,9 +13,11 @@
 # limitations under the License.
 #
 ################################################################################
+"""Templates for OSS-Fuzz project files."""
 
 PROJECT_YAML_TEMPLATE = """\
 homepage: "<your_project_homepage>"
+language: <programming_language>  # Example values: c, c++, go, rust.
 primary_contact: "<primary_contact_email>"
 """
 

diff --git a/projects/arduinojson/project.yaml b/projects/arduinojson/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://github.com/bblanchon/ArduinoJson"
+language: c++
 primary_contact: "[email protected]"
 sanitizers:
   - address

diff --git a/projects/arrow/project.yaml b/projects/arrow/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://arrow.apache.org/"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
   - "[email protected]"

diff --git a/projects/aspell/project.yaml b/projects/aspell/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://github.com/GNUAspell/aspell"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
   - "[email protected]"

diff --git a/projects/augeas/project.yaml b/projects/augeas/project.yaml
@@ -1,4 +1,5 @@
 homepage: https://github.com/hercules-team/augeas
+language: c++
 primary_contact: [email protected]
 auto_ccs:
   - [email protected]

diff --git a/projects/avahi/project.yaml b/projects/avahi/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://avahi.org/"
+language: c++
 primary_contact: [email protected]
 auto_ccs:
   - [email protected]

diff --git a/projects/bad_example/project.yaml b/projects/bad_example/project.yaml
@@ -1,6 +1,7 @@
-disabled: True
 homepage: "http://www.zlib.net/"
+language: c++
 sanitizers:
   - address
   - memory
   - undefined
+disabled: True
diff --git a/projects/bignum-fuzzer/project.yaml b/projects/bignum-fuzzer/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://github.com/guidovranken/bignum-fuzzer"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
     - "[email protected]"

diff --git a/projects/binutils/project.yaml b/projects/binutils/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://www.gnu.org/software/binutils/"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs :
   - "[email protected]"

diff --git a/projects/bloaty/project.yaml b/projects/bloaty/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://github.com/google/bloaty"
+language: c++
 primary_contact: "[email protected]"
 architectures:
   - x86_64

diff --git a/projects/boost/project.yaml b/projects/boost/project.yaml
@@ -1,4 +1,5 @@
 homepage: "http://www.boost.org/"
+language: c++
 
 # TODO: add more boost maintainers here and possibly a mailing list.
 # primary_contact: "[email protected]"

diff --git a/projects/boringssl/project.yaml b/projects/boringssl/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://boringssl.googlesource.com/boringssl/"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
  - "[email protected]"

diff --git a/projects/botan/project.yaml b/projects/botan/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://botan.randombit.net"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
   - "[email protected]"

diff --git a/projects/brotli/project.yaml b/projects/brotli/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://github.com/google/brotli"
+language: c++
 primary_contact: "[email protected]"
 vendor_ccs:
   - "[email protected]"

diff --git a/projects/bzip2/project.yaml b/projects/bzip2/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://sourceware.org/bzip2/"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
   - "[email protected]"

diff --git a/projects/c-ares/project.yaml b/projects/c-ares/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://c-ares.haxx.se/"
+language: c++
 primary_contact: "[email protected]"
 fuzzing_engines:
   - afl

diff --git a/projects/c-blosc/project.yaml b/projects/c-blosc/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://github.com/Blosc/c-blosc"
+language: c++
 primary_contact: "[email protected]"
 sanitizers:
   - address

diff --git a/projects/capstone/project.yaml b/projects/capstone/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://www.capstone-engine.org"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs : 
   - "[email protected]"

diff --git a/projects/casync/project.yaml b/projects/casync/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://github.com/casync/casync"
+language: c++
 primary_contact: "[email protected]"
 sanitizers:
   - address

diff --git a/projects/chakra/project.yaml b/projects/chakra/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://github.com/Microsoft/ChakraCore"
+language: c++
 primary_contact: "[email protected]"
 fuzzing_engines:
   - none

diff --git a/projects/cjson/project.yaml b/projects/cjson/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://github.com/DaveGamble/cJSON"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
   - "[email protected]"

diff --git a/projects/clamav/project.yaml b/projects/clamav/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://www.clamav.net/"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
     - [email protected]

diff --git a/projects/cmark/project.yaml b/projects/cmark/project.yaml
@@ -1,4 +1,5 @@
 homepage: "http://commonmark.org"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
   - "[email protected]"

diff --git a/projects/cppcheck/project.yaml b/projects/cppcheck/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://cppcheck.sourceforge.net"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
   - "[email protected]"

diff --git a/projects/cpython3/project.yaml b/projects/cpython3/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://python.org/"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
  - "[email protected]"

diff --git a/projects/cras/project.yaml b/projects/cras/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://www.chromium.org"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
   - "[email protected]"

diff --git a/projects/cryptofuzz/project.yaml b/projects/cryptofuzz/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://github.com/guidovranken/cryptofuzz"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
     - "[email protected]"

diff --git a/projects/curl/project.yaml b/projects/curl/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://curl.haxx.se/"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
   - "[email protected]"

diff --git a/projects/dav1d/project.yaml b/projects/dav1d/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://code.videolan.org/videolan/dav1d"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
   - "[email protected]"

diff --git a/projects/django/project.yaml b/projects/django/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://www.djangoproject.com/"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
  - "[email protected]"

diff --git a/projects/dlplibs/project.yaml b/projects/dlplibs/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://www.documentliberation.org"
+language: c++
 primary_contact: "[email protected]"
 sanitizers:
   - address

diff --git a/projects/double-conversion/project.yaml b/projects/double-conversion/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://github.com/google/double-conversion"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
   - "[email protected]"

diff --git a/projects/dropbear/project.yaml b/projects/dropbear/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://matt.ucc.asn.au/dropbear/dropbear.html"
+language: c++
 primary_contact: "[email protected]"
 sanitizers:
   - address

diff --git a/projects/easywsclient/project.yaml b/projects/easywsclient/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://github.com/dhbaird/easywsclient"
+language: c++
 primary_contact: "[email protected]"
 sanitizers:
   - address

diff --git a/projects/ecc-diff-fuzzer/project.yaml b/projects/ecc-diff-fuzzer/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://github.com/catenacyber/elliptic-curve-differential-fuzzer"
+language: c++
 primary_contact: "[email protected]"
 
 architectures:

diff --git a/projects/eigen/project.yaml b/projects/eigen/project.yaml
@@ -1,4 +1,5 @@
 homepage: "http://eigen.tuxfamily.org/index.php?title=Main_Page"
+language: c++
 primary_contact: "[email protected]"
 sanitizers:
   - address

diff --git a/projects/envoy/project.yaml b/projects/envoy/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://www.envoyproxy.io/"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
   - "[email protected]"

diff --git a/projects/esp-v2/project.yaml b/projects/esp-v2/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://github.com/GoogleCloudPlatform/esp-v2"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
 - "[email protected]"

diff --git a/projects/example/project.yaml b/projects/example/project.yaml
@@ -1,6 +1,9 @@
 # Provide the home page for *your* project:
 homepage: "https://my-api.example.com"
 
+# Language the project is written in:
+language: c++
+
 # Provide the e-mail for the primary contact and others:
 # Un-comment the below lines to make auto-cc work.
 # primary_contact: "[email protected]"

diff --git a/projects/expat/project.yaml b/projects/expat/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://github.com/libexpat/libexpat"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
  - "[email protected]"

diff --git a/projects/ffmpeg/project.yaml b/projects/ffmpeg/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://www.ffmpeg.org/"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
  - "[email protected]"

diff --git a/projects/file/project.yaml b/projects/file/project.yaml
@@ -1,4 +1,5 @@
 homepage: "http://www.darwinsys.com/file/"
+language: c++
 primary_contact: "[email protected]"
 sanitizers:
   - address

diff --git a/projects/firefox/project.yaml b/projects/firefox/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://www.mozilla.org/firefox/"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
   - [email protected]

diff --git a/projects/firestore/project.yaml b/projects/firestore/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://firebase.google.com/docs/firestore/"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
   - "[email protected]"

diff --git a/projects/flac/project.yaml b/projects/flac/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://xiph.org/flac/"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
  - "[email protected]"

diff --git a/projects/freeimage/project.yaml b/projects/freeimage/project.yaml
@@ -1,4 +1,5 @@
 homepage: "http://freeimage.sourceforge.net/"
+language: c++
 primary_contact: "[email protected]"
 
 sanitizers:

diff --git a/projects/freetype2/project.yaml b/projects/freetype2/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://www.freetype.org/"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
   - "[email protected]"

diff --git a/projects/fuzzing-puzzles/project.yaml b/projects/fuzzing-puzzles/project.yaml
@@ -1,4 +1,5 @@
 homepage: https://github.com/google/fuzzer-test-suite
+language: c++
 primary_contact: [email protected]
 auto_ccs:
   - "[email protected]"

diff --git a/projects/gdal/project.yaml b/projects/gdal/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://gdal.org"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
   - "[email protected]"

diff --git a/projects/gfwx/project.yaml b/projects/gfwx/project.yaml
@@ -1,4 +1,5 @@
 homepage: "http://www.gfwx.org/"
+language: c++
 primary_contact: "[email protected]"
 sanitizers:
  - address

diff --git a/projects/ghostscript/project.yaml b/projects/ghostscript/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://ghostscript.com"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
   - "[email protected]"

diff --git a/projects/giflib/project.yaml b/projects/giflib/project.yaml
@@ -1,4 +1,5 @@
 homepage: "http://giflib.sourceforge.net/"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
   - "[email protected]"

diff --git a/projects/git/project.yaml b/projects/git/project.yaml
@@ -1,2 +1,3 @@
 homepage: "https://git-scm.com"
+language: c++
 primary_contact: "[email protected]"
diff --git a/projects/glib/project.yaml b/projects/glib/project.yaml
@@ -1,4 +1,5 @@
 homepage: "https://gitlab.gnome.org/GNOME/glib/"
+language: c++
 primary_contact: "[email protected]"
 auto_ccs:
 - [email protected]

diff --git a/projects/gnupg/project.yaml b/projects/gnupg/project.yaml
@@ -1,2 +1,3 @@
 homepage: "https://www.gnupg.org"
+language: c++
 primary_contact: "[email protected]"