Skip to content

Commit 95a5535

Browse files
authored
Merge branch 'master' into unknown
2 parents 678a044 + aa75c4f commit 95a5535

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1317
-192
lines changed

Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ mock = "==2.0.0"
2020
nodeenv = "==1.0.0"
2121
parameterized = "==0.6.1"
2222
paramiko = "==2.6.0"
23-
pipenv = "==2022.1.8"
23+
pipenv = "==2022.8.5"
2424
pyfakefs = "==4.4.0"
2525
pylint = "~=2.4"
2626
selenium = "==3.141.0"

Pipfile.lock

Lines changed: 68 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configs/test/issue_trackers/config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ test-project:
8888
os: OS-%PLATFORM%
8989
# Label to apply when adding CCs from owners files.
9090
auto_cc_from_owners: ClusterFuzz-Auto-CC
91+
# Optional: Map crash types to labels.
92+
#crash_types:
93+
# stack-buffer-overflow: Memory-Corruption
94+
# stack-overflow: Resource-Exhaustion
9195
# Optional: For issue trackers where labels need to be mapped to some other
9296
# representation (e.g. an ID), substitutions from above need to be mapped
9397
# explicitly.

configs/test/project.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ monitoring:
4545
firebase:
4646
# API key for Firebase (public).
4747
api_key: firebase-api-key
48-
# auth_domain: login.custom-domain.com
48+
auth_domain: login.custom-domain.com
4949
auth_providers:
5050
- google.com
5151
# - github.com

docker/ci/Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
# limitations under the License.
1414
FROM gcr.io/clusterfuzz-images/base
1515

16-
# Use nodesource nodejs packages.
17-
RUN curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash -
18-
1916
# TOOD(ochang):Also need libnss3 libfreetype6 libfontconfig1 libgconf-2-4 xvfb for chrome-driver.
2017
RUN apt-get update && \
2118
apt-get install -y \
@@ -27,8 +24,7 @@ RUN apt-get update && \
2724
google-cloud-sdk-datastore-emulator \
2825
google-cloud-sdk-pubsub-emulator=312.0.0-0 \
2926
liblzma-dev \
30-
nodejs \
31-
openjdk-8-jdk
27+
openjdk-11-jdk
3228

3329
# Install Bazel as per https://docs.bazel.build/versions/master/install-ubuntu.html#using-bazel-custom-apt-repository.
3430
RUN echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list && \

docs/Gemfile.lock

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (6.1.7.1)
4+
activesupport (7.0.4.3)
55
concurrent-ruby (~> 1.0, >= 1.0.2)
66
i18n (>= 1.6, < 2)
77
minitest (>= 5.1)
88
tzinfo (~> 2.0)
9-
zeitwerk (~> 2.3)
109
addressable (2.8.0)
1110
public_suffix (>= 2.0.2, < 5.0)
1211
coffee-script (2.4.1)
1312
coffee-script-source
1413
execjs
1514
coffee-script-source (1.11.1)
1615
colorator (1.1.0)
17-
commonmarker (0.23.7)
16+
commonmarker (0.23.9)
1817
concurrent-ruby (1.2.0)
1918
dnsruby (1.61.9)
2019
simpleidn (~> 0.1)
@@ -32,12 +31,12 @@ GEM
3231
ffi (1.15.5)
3332
forwardable-extended (2.6.0)
3433
gemoji (3.0.1)
35-
github-pages (227)
34+
github-pages (228)
3635
github-pages-health-check (= 1.17.9)
37-
jekyll (= 3.9.2)
36+
jekyll (= 3.9.3)
3837
jekyll-avatar (= 0.7.0)
3938
jekyll-coffeescript (= 1.1.1)
40-
jekyll-commonmark-ghpages (= 0.2.0)
39+
jekyll-commonmark-ghpages (= 0.4.0)
4140
jekyll-default-layout (= 0.1.4)
4241
jekyll-feed (= 0.15.1)
4342
jekyll-gist (= 1.5.0)
@@ -71,7 +70,7 @@ GEM
7170
jemoji (= 0.12.0)
7271
kramdown (= 2.3.2)
7372
kramdown-parser-gfm (= 1.1.0)
74-
liquid (= 4.0.3)
73+
liquid (= 4.0.4)
7574
mercenary (~> 0.3)
7675
minima (= 2.5.1)
7776
nokogiri (>= 1.13.6, < 2.0)
@@ -83,17 +82,17 @@ GEM
8382
octokit (~> 4.0)
8483
public_suffix (>= 3.0, < 5.0)
8584
typhoeus (~> 1.3)
86-
html-pipeline (2.14.2)
85+
html-pipeline (2.14.3)
8786
activesupport (>= 2)
8887
nokogiri (>= 1.4)
8988
http_parser.rb (0.8.0)
90-
i18n (0.9.5)
89+
i18n (1.12.0)
9190
concurrent-ruby (~> 1.0)
92-
jekyll (3.9.2)
91+
jekyll (3.9.3)
9392
addressable (~> 2.4)
9493
colorator (~> 1.0)
9594
em-websocket (~> 0.5)
96-
i18n (~> 0.7)
95+
i18n (>= 0.7, < 2)
9796
jekyll-sass-converter (~> 1.0)
9897
jekyll-watch (~> 2.0)
9998
kramdown (>= 1.17, < 3)
@@ -109,11 +108,11 @@ GEM
109108
coffee-script-source (~> 1.11.1)
110109
jekyll-commonmark (1.4.0)
111110
commonmarker (~> 0.22)
112-
jekyll-commonmark-ghpages (0.2.0)
113-
commonmarker (~> 0.23.4)
111+
jekyll-commonmark-ghpages (0.4.0)
112+
commonmarker (~> 0.23.7)
114113
jekyll (~> 3.9.0)
115114
jekyll-commonmark (~> 1.4.0)
116-
rouge (>= 2.0, < 4.0)
115+
rouge (>= 2.0, < 5.0)
117116
jekyll-default-layout (0.1.4)
118117
jekyll (~> 3.0)
119118
jekyll-feed (0.15.1)
@@ -201,18 +200,18 @@ GEM
201200
rexml
202201
kramdown-parser-gfm (1.1.0)
203202
kramdown (~> 2.0)
204-
liquid (4.0.3)
203+
liquid (4.0.4)
205204
listen (3.7.1)
206205
rb-fsevent (~> 0.10, >= 0.10.3)
207206
rb-inotify (~> 0.9, >= 0.9.10)
208207
mercenary (0.3.6)
209-
mini_portile2 (2.8.0)
208+
mini_portile2 (2.8.1)
210209
minima (2.5.1)
211210
jekyll (>= 3.5, < 5.0)
212211
jekyll-feed (~> 0.9)
213212
jekyll-seo-tag (~> 2.1)
214213
minitest (5.17.0)
215-
nokogiri (1.13.8)
214+
nokogiri (1.14.3)
216215
mini_portile2 (~> 2.8.0)
217216
racc (~> 1.4)
218217
octokit (4.25.1)
@@ -221,7 +220,7 @@ GEM
221220
pathutil (0.16.2)
222221
forwardable-extended (~> 2.6)
223222
public_suffix (4.0.7)
224-
racc (1.6.0)
223+
racc (1.6.2)
225224
rb-fsevent (0.11.1)
226225
rb-inotify (0.10.1)
227226
ffi (~> 1.0)
@@ -242,17 +241,15 @@ GEM
242241
unf (~> 0.1.4)
243242
terminal-table (1.8.0)
244243
unicode-display_width (~> 1.1, >= 1.1.1)
245-
thread_safe (0.3.6)
246244
typhoeus (1.4.0)
247245
ethon (>= 0.9.0)
248-
tzinfo (1.2.10)
249-
thread_safe (~> 0.1)
246+
tzinfo (2.0.6)
247+
concurrent-ruby (~> 1.0)
250248
unf (0.1.4)
251249
unf_ext
252250
unf_ext (0.0.8.2)
253251
unicode-display_width (1.8.0)
254252
webrick (1.7.0)
255-
zeitwerk (2.6.6)
256253

257254
PLATFORMS
258255
ruby

docs/_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ markdown: kramdown
2323
remote_theme: pmarsceill/just-the-docs
2424
search_enabled: true
2525

26-
ga_tracking: UA-88024544-3
26+
ga_tracking: G-DBK55850L0
2727

2828
aux_links:
2929
"ClusterFuzz on GitHub":

local/install_deps_linux.bash

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,12 @@ else
153153
fi
154154

155155
# Setup pipenv and install python dependencies.
156-
$PYTHON -m pip install --user pipenv
156+
$PYTHON -m pip install --user pipenv==2022.8.5
157+
if $PYTHON -m pipenv --venv > /dev/null 2>&1; then
158+
# Remove existing pipenv virtual environment.
159+
$PYTHON -m pipenv --rm
160+
fi
161+
157162
$PYTHON -m pipenv --python $PYTHON
158163
$PYTHON -m pipenv sync --dev
159164
source "$(${PYTHON} -m pipenv --venv)/bin/activate"

src/appengine/handlers/auth.py

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# Copyright 2019 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
"""Auth page."""
15+
16+
import gzip
17+
import logging
18+
19+
from flask import request
20+
from flask import Response
21+
import requests
22+
23+
from handlers import base_handler
24+
from libs import auth
25+
from libs import handler
26+
27+
28+
class Handler(base_handler.Handler):
29+
"""Auth page."""
30+
31+
@handler.get(handler.HTML)
32+
def get(self, extra=None):
33+
"""Handle a get request."""
34+
# We use `request.url` which is already the full URL.
35+
del extra
36+
target_url = request.url.replace(auth.auth_domain(),
37+
auth.real_auth_domain(), 1)
38+
logging.info('Forwarding auth request to: %s', target_url)
39+
response = requests.get(target_url)
40+
gzip_response = gzip.compress(response.text.encode('utf-8'))
41+
flask_response = Response(
42+
gzip_response,
43+
status=response.status_code,
44+
headers=dict(response.headers))
45+
flask_response.headers['Content-Encoding'] = 'gzip'
46+
47+
return flask_response

0 commit comments

Comments
 (0)