zuul/zuul-preview
Code Issues Proposed changes

Merge "Handle SSL proxying and other fixes"

Browse Source
This commit is contained in:
Zuul 2020-04-08 17:11:47 +00:00 committed by Gerrit Code Review
commit e0a596bf15
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.dockerignore Normal file
View File

@ -0,0 +1,2 @@
.dockerignore
Dockerfile

2
Dockerfile
View File

@ -34,7 +34,7 @@ RUN apt-get update \
&& apt-get install -y dumb-init apache2 $(cat /run.txt) \ && apt-get install -y dumb-init apache2 $(cat /run.txt) \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* /run.txt \ && rm -rf /var/lib/apt/lists/* /run.txt \
&& a2enmod rewrite proxy proxy_http && a2enmod rewrite proxy proxy_http ssl
COPY ./vhost.conf /etc/apache2/sites-available/000-default.conf COPY ./vhost.conf /etc/apache2/sites-available/000-default.conf
COPY --from=builder /usr/local /usr/local COPY --from=builder /usr/local /usr/local

1
vhost.conf
View File

@ -9,4 +9,5 @@
RewriteMap preview "prg://usr/local/bin/zuul-preview" RewriteMap preview "prg://usr/local/bin/zuul-preview"
RewriteRule "^/notfound" "-" [F] RewriteRule "^/notfound" "-" [F]
RewriteRule "^/?(.*)$" "${preview:%{ENV:ZUUL_API_URL} %{HTTP_HOST}|http://localhost/notfound}/$1" [P] RewriteRule "^/?(.*)$" "${preview:%{ENV:ZUUL_API_URL} %{HTTP_HOST}|http://localhost/notfound}/$1" [P]
SSLProxyEngine on
</VirtualHost> </VirtualHost>

7
zuul-preview/main.cc
View File

@ -165,7 +165,7 @@ int main(int, char**)
auto body = response.extract_json().get(); auto body = response.extract_json().get();
auto artifacts = body["artifacts"].as_array(); auto artifacts = body["artifacts"].as_array();
string artifact_url = "Artifact_not_found"; string artifact_url = "NULL";
for (uint i = 0; i < artifacts.size(); i++) { for (uint i = 0; i < artifacts.size(); i++) {
if (artifacts[i].has_field("metadata") && if (artifacts[i].has_field("metadata") &&
artifacts[i]["metadata"].has_field("type") && artifacts[i]["metadata"].has_field("type") &&
@ -175,6 +175,11 @@ int main(int, char**)
} }
} }
// The apache config is guaranteed to add a / to this, so avoid
// double slashes on the end.
if (artifact_url.back() == '/') {
artifact_url.pop_back();
}
cout << artifact_url << endl; cout << artifact_url << endl;
cache.put(hostname, artifact_url); cache.put(hostname, artifact_url);