Merge pull request #208 from thecodingmachine/6.3.0-dev

6.3.0
adding warning about URL conversion to a Docker Compose service named app
2026-08-15 11:52:14 +01:00 · 2020-06-22 10:58:01 +02:00 · 2020-06-09 16:38:28 +02:00 · 2020-06-09 16:30:22 +02:00 · 2020-06-09 16:30:05 +02:00 · 2020-06-09 16:29:14 +02:00
21 changed files with 181 additions and 84 deletions
--- a/5
+++ b/5
@@ -5,7 +5,7 @@ DOCKER_PASSWORD=
 DOCKER_REGISTRY=thecodingmachine
 GOTENBERG_USER_GID=1001
 GOTENBERG_USER_UID=1001
-GOLANGCI_LINT_VERSION=1.25.1
+GOLANGCI_LINT_VERSION=1.27.0
 CODE_COVERAGE=0
 TINI_VERSION=0.19.0
 MAXIMUM_WAIT_TIMEOUT=30.0
@@ -19,6 +19,7 @@ DISABLE_UNOCONV=0
 LOG_LEVEL=INFO
 ROOT_PATH=/
 DEFAULT_GOOGLE_CHROME_RPCC_BUFFER_SIZE=1048576
 GOOGLE_CHROME_IGNORE_CERTIFICATE_ERRORS=0
 # build the base Docker image.
 base:
@@ -57,7 +58,7 @@ image:
 # start the API using previously built Docker image.
 gotenberg:
-	docker run -it --rm -e MAXIMUM_WAIT_TIMEOUT=$(MAXIMUM_WAIT_TIMEOUT) -e MAXIMUM_WAIT_DELAY=$(MAXIMUM_WAIT_DELAY) -e MAXIMUM_WEBHOOK_URL_TIMEOUT=$(MAXIMUM_WEBHOOK_URL_TIMEOUT) -e DEFAULT_WEBHOOK_URL_TIMEOUT=$(DEFAULT_WEBHOOK_URL_TIMEOUT) -e MAXIMUM_WEBHOOK_URL_TIMEOUT=$(MAXIMUM_WEBHOOK_URL_TIMEOUT) -e DEFAULT_LISTEN_PORT=$(DEFAULT_LISTEN_PORT) -e DISABLE_GOOGLE_CHROME=$(DISABLE_GOOGLE_CHROME) -e DISABLE_UNOCONV=$(DISABLE_UNOCONV) -e LOG_LEVEL=$(LOG_LEVEL) -e ROOT_PATH=$(ROOT_PATH) -e DEFAULT_GOOGLE_CHROME_RPCC_BUFFER_SIZE=$(DEFAULT_GOOGLE_CHROME_RPCC_BUFFER_SIZE)  -p "$(DEFAULT_LISTEN_PORT):$(DEFAULT_LISTEN_PORT)" $(DOCKER_REGISTRY)/gotenberg:$(VERSION)
+	docker run -it --rm -e MAXIMUM_WAIT_TIMEOUT=$(MAXIMUM_WAIT_TIMEOUT) -e MAXIMUM_WAIT_DELAY=$(MAXIMUM_WAIT_DELAY) -e MAXIMUM_WEBHOOK_URL_TIMEOUT=$(MAXIMUM_WEBHOOK_URL_TIMEOUT) -e DEFAULT_WEBHOOK_URL_TIMEOUT=$(DEFAULT_WEBHOOK_URL_TIMEOUT) -e MAXIMUM_WEBHOOK_URL_TIMEOUT=$(MAXIMUM_WEBHOOK_URL_TIMEOUT) -e DEFAULT_LISTEN_PORT=$(DEFAULT_LISTEN_PORT) -e DISABLE_GOOGLE_CHROME=$(DISABLE_GOOGLE_CHROME) -e DISABLE_UNOCONV=$(DISABLE_UNOCONV) -e LOG_LEVEL=$(LOG_LEVEL) -e ROOT_PATH=$(ROOT_PATH) -e DEFAULT_GOOGLE_CHROME_RPCC_BUFFER_SIZE=$(DEFAULT_GOOGLE_CHROME_RPCC_BUFFER_SIZE) -e GOOGLE_CHROME_IGNORE_CERTIFICATE_ERRORS=$(GOOGLE_CHROME_IGNORE_CERTIFICATE_ERRORS)  -p "$(DEFAULT_LISTEN_PORT):$(DEFAULT_LISTEN_PORT)" $(DOCKER_REGISTRY)/gotenberg:$(VERSION)
 # publish Gotenberg images according to version.
 publish:
--- a/build/docs/content/01-install.md
+++ b/build/docs/content/01-install.md
@@ -24,7 +24,7 @@ For instance:
 ```bash
 $ git clone https://github.com/thecodingmachine/gotenberg.git
-$ make publish GOTENBERG_USER_GID=your_custom_gid GOTENBERG_USER_UID=your_custom_uid DOCKER_REGISTRY=your_registry DOCKER_USER=registry_user DOCKER_PASSWORD=registry_password VERSION=6.2.0
+$ make publish GOTENBERG_USER_GID=your_custom_gid GOTENBERG_USER_UID=your_custom_uid DOCKER_REGISTRY=your_registry DOCKER_USER=registry_user DOCKER_PASSWORD=registry_password VERSION=version
 ```
 > `master` branch is always up-to-date with the latest version of the API.
--- a/build/docs/content/03-environment-variables.md
+++ b/build/docs/content/03-environment-variables.md
@@ -58,6 +58,14 @@ The hard limit is 100 MB and is defined by Google Chrome itself.
 > The default Google Chrome rpcc buffer size may also be overridden per request thanks to the form field `googleChromeRpccBufferSize`.
 > See the [rpcc buffer size section](#html.rpcc_buffer_size).
 ## Google Chrome ignore certificate errors
 When performing a [URL](#url) conversion, Google Chrome will not accept certificate errors. 
 You may allow insecure connections by setting the `GOOGLE_CHROME_IGNORE_CERTIFICATE_ERRORS` environment variable to `"1"`.
 **You should be careful with this feature and only enable it in your development environment.**
 ## Disable LibreOffice (unoconv)
 You may also disable LibreOffice (unoconv) with `DISABLE_UNOCONV`.
--- a/build/docs/content/05-url.md
+++ b/build/docs/content/05-url.md
@@ -14,6 +14,9 @@ named `remoteURL` instead. Otherwise, URL conversions work the same as HTML conv
 > **Attention:** when converting a website to PDF, you should remove all margins.
 > If not, some of the content of the page might be hidden.
 > **Attention:** if you try to convert a URL from a Docker Compose service named `app` (i.e. `removeURL` = `http://app/an/entrypoint`),
 > the resulting PDF will be blank. Make sure to rename your service to avoid this issue.
 ### cURL
 ```bash
--- a/build/lint/Dockerfile
+++ b/build/lint/Dockerfile
@@ -19,4 +19,4 @@ COPY . .
 RUN go mod download &&\
    go mod verify
-CMD ["golangci-lint", "run" ,"--tests=false", "--enable-all", "--disable=dupl", "--disable=funlen", "--disable=wsl", "--disable=gocognit", "--disable=gomnd" ]
+CMD ["golangci-lint", "run" ,"--tests=false", "--enable-all", "--disable=dupl", "--disable=funlen", "--disable=wsl", "--disable=gocognit", "--disable=gomnd", "--disable=goimports" ]
--- a/build/package/Dockerfile
+++ b/build/package/Dockerfile
@@ -10,7 +10,7 @@ FROM thecodingmachine/gotenberg:workspace AS workspace
 ARG VERSION
 ENV GOOS=linux \
-    GOARCH=amd64 \
+    GOARCH=amd64 \
    CGO_ENABLED=0
 # Define our workding outside of $GOPATH (we're using go modules).
@@ -42,7 +42,7 @@ LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>"
 ARG TINI_VERSION
-ADD --chown=gotenberg https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini-static /tini
+ADD https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini-static /tini
 RUN chmod +x /tini
 ENTRYPOINT [ "/tini", "--" ]
--- a/cmd/gotenberg/main.go
+++ b/cmd/gotenberg/main.go
@@ -1,6 +1,7 @@
 package main
 import (
 	"errors"
 	"fmt"
 	"net/http"
 	"os"
@@ -28,7 +29,7 @@ func main() {
 	systemLogger.DebugOpf(op, "configuration: %+v", config)
 	if !config.DisableGoogleChrome() {
 		// start Google Chrome headless.
-		if err := chrome.Start(systemLogger); err != nil {
+		if err := chrome.Start(systemLogger, config.GoogleChromeIgnoreCertificateErrors()); err != nil {
 			systemLogger.FatalOp(op, err)
 		}
 	}
@@ -38,7 +39,7 @@ func main() {
 	go func() {
 		systemLogger.InfoOpf(op, "http server started on port '%d'", config.DefaultListenPort())
 		if err := srv.Start(fmt.Sprintf(":%d", config.DefaultListenPort())); err != nil {
-			if err != http.ErrServerClosed {
+			if errors.Is(err, http.ErrServerClosed) {
 				systemLogger.FatalOp(op, err)
 			}
 		}
--- a/docs/index.html
+++ b/docs/index.html
@@ -154,7 +154,7 @@
 <p>For instance:</p>
 <pre class="chroma">$ git clone https://github.com/thecodingmachine/gotenberg.git
-$ make publish <span class="nv">GOTENBERG_USER_GID</span><span class="o">=</span>your_custom_gid <span class="nv">GOTENBERG_USER_UID</span><span class="o">=</span>your_custom_uid <span class="nv">DOCKER_REGISTRY</span><span class="o">=</span>your_registry <span class="nv">DOCKER_USER</span><span class="o">=</span>registry_user <span class="nv">DOCKER_PASSWORD</span><span class="o">=</span>registry_password <span class="nv">VERSION</span><span class="o">=</span>6.2.0
+$ make publish <span class="nv">GOTENBERG_USER_GID</span><span class="o">=</span>your_custom_gid <span class="nv">GOTENBERG_USER_UID</span><span class="o">=</span>your_custom_uid <span class="nv">DOCKER_REGISTRY</span><span class="o">=</span>your_registry <span class="nv">DOCKER_USER</span><span class="o">=</span>registry_user <span class="nv">DOCKER_PASSWORD</span><span class="o">=</span>registry_password <span class="nv">VERSION</span><span class="o">=</span>version
 </pre>
 <blockquote>
@@ -332,6 +332,16 @@ The hard limit is 100 MB and is defined by Google Chrome itself.</p>
 See the <a href="#html.rpcc_buffer_size">rpcc buffer size section</a>.</p>
 </blockquote>
 <h2 class="Heading"><a class="Anchor" aria-hidden="true" id="environment_variables.google_chrome_ignore_certificate_errors" href="#environment_variables.google_chrome_ignore_certificate_errors">
 	<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-link"><path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path></svg>
 </a>Google Chrome ignore certificate errors</h2>
 <p>When performing a <a href="#url">URL</a> conversion, Google Chrome will not accept certificate errors.</p>
 <p>You may allow insecure connections by setting the <code>GOOGLE_CHROME_IGNORE_CERTIFICATE_ERRORS</code> environment variable to <code>&#34;1&#34;</code>.</p>
 <p><strong>You should be careful with this feature and only enable it in your development environment.</strong></p>
 <h2 class="Heading"><a class="Anchor" aria-hidden="true" id="environment_variables.disable_libre_office_unoconv" href="#environment_variables.disable_libre_office_unoconv">
 	<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-link"><path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path></svg>
 </a>Disable LibreOffice (unoconv)</h2>
@@ -929,6 +939,9 @@ named <code>remoteURL</code> instead. Otherwise, URL conversions work the same a
 <blockquote>
 <p><strong>Attention:</strong> when converting a website to PDF, you should remove all margins.
 If not, some of the content of the page might be hidden.</p>
 <p><strong>Attention:</strong> if you try to convert a URL from a Docker Compose service named <code>app</code> (i.e. <code>removeURL</code> = <code>http://app/an/entrypoint</code>),
 the resulting PDF will be blank. Make sure to rename your service to avoid this issue.</p>
 </blockquote>
 <h3 class="Heading"><a class="Anchor" aria-hidden="true" id="url.basic.c_url" href="#url.basic.c_url">
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,6 @@ go 1.14
 require (
 	github.com/dustin/go-humanize v1.0.0
 	github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/labstack/echo/v4 v4.1.16
 	github.com/labstack/gommon v0.3.0
@@ -15,13 +14,13 @@ require (
 	github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
 	github.com/russross/blackfriday/v2 v2.0.1
 	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
-	github.com/sirupsen/logrus v1.5.0
+	github.com/sirupsen/logrus v1.6.0
-	github.com/stretchr/testify v1.5.1
+	github.com/stretchr/testify v1.6.1
-	golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 // indirect
+	golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9 // indirect
-	golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5 // indirect
+	golang.org/x/net v0.0.0-20200602114024-627f9648deb9 // indirect
 	golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a
-	golang.org/x/sys v0.0.0-20200501052902-10377860bb8e // indirect
+	golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980 // indirect
 	golang.org/x/text v0.3.2
 	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
-	gopkg.in/yaml.v2 v2.2.8 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -10,7 +10,6 @@ github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -43,13 +42,13 @@ github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
-github.com/sirupsen/logrus v1.5.0 h1:1N5EYkVAPEywqZRJd7cwnRtCb6xJx7NH3T3WUTF980Q=
+github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
-github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
+github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
@@ -59,15 +58,16 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 h1:IaQbIIB2X/Mp/DKctl6ROxz1KyMlKp4uyvL6+kQ7C88=
+golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9 h1:vEg9joUBmeBcK9iSJftGNf3coIG4HqZElCPehJsfAYM=
-golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5 h1:WQ8q63x+f/zpC8Ac1s9wLElVoHhm32p6tudrU72n1QA=
+golang.org/x/net v0.0.0-20200602114024-627f9648deb9 h1:pNX+40auqi2JqRfOP1akLGtYcn15TUbkhwuCO3foqqM=
-golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a h1:WXEvlFVvvGxCJLG6REjsT03iWnKLEWinaScsxF2Vm2o=
@@ -80,13 +80,14 @@ golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200501052902-10377860bb8e h1:hq86ru83GdWTlfQFZGO4nZJTU4Bs2wfHl8oFHRaXsfc=
+golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980 h1:OjiUf46hAmXblsZdnoSXsEUSKU8r1UEzcL5RVZ4gO9Y=
-golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200330183114-f8bfb4ee3038 h1:FUufmZ17Dp41BwLDPii6R8vp0QtIquTiDIxcbFlY1ek=
 golang.org/x/tools v0.0.0-20200330183114-f8bfb4ee3038/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -96,5 +97,6 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c h1:grhR+C34yXImVGp7EzNk+DTIk+323eIUWOmEevy6bDo=
 gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/internal/app/xhttp/handler.go
+++ b/internal/app/xhttp/handler.go
@@ -308,7 +308,7 @@ func convertAsync(ctx context.Context, p printer.Printer, filename, fpath string
 		return xerror.New(op, err)
 	}
 	go func() {
-		defer r.Close() // nolint: errcheck
+		defer r.Close()
 		if err := p.Print(fpath); err != nil {
 			xerr := xerror.New(op, err)
 			logger.ErrorOp(xerror.Op(xerr), xerr)
@@ -320,7 +320,7 @@ func convertAsync(ctx context.Context, p printer.Printer, filename, fpath string
 			logger.ErrorOp(xerror.Op(xerr), xerr)
 			return
 		}
-		defer f.Close() // nolint: errcheck
+		defer f.Close()
 		logger.DebugOpf(
 			op,
 			"preparing to send result file '%s' to '%s'...",
@@ -360,7 +360,7 @@ func convertAsync(ctx context.Context, p printer.Printer, filename, fpath string
 			logger.ErrorOp(xerror.Op(xerr), xerr)
 			return
 		}
-		defer resp.Body.Close() // nolint: errcheck
+		defer resp.Body.Close()
 		logger.DebugOpf(
 			op,
 			"result file '%s' sent to '%s'",
--- a/internal/app/xhttp/pkg/context/context.go
+++ b/internal/app/xhttp/pkg/context/context.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
 	"path/filepath"
 	"reflect"
 	"strconv"
 	"strings"
@@ -105,8 +106,10 @@ func (ctx *Context) WithResource(directoryName string) error {
 				if err != nil {
 					return r, err
 				}
-				defer in.Close() // nolint: errcheck
+				defer in.Close()
-				if err := r.WithFile(fh.Filename, in); err != nil {
+				// avoid directory traversal.
 				filename := filepath.Base(fh.Filename)
 				if err := r.WithFile(filename, in); err != nil {
 					return r, err
 				}
 			}
--- a/internal/app/xhttp/pkg/resource/file.go
+++ b/internal/app/xhttp/pkg/resource/file.go
@@ -24,7 +24,7 @@ func (f file) write(in io.Reader) error {
 		if err != nil {
 			return err
 		}
-		defer out.Close() // nolint: errcheck
+		defer out.Close()
 		if err := out.Chmod(0600); err != nil {
 			return err
 		}
--- a/internal/pkg/chrome/chrome.go
+++ b/internal/pkg/chrome/chrome.go
@@ -16,11 +16,11 @@ import (
 )
 // Start starts Google Chrome headless in background.
-func Start(logger xlog.Logger) error {
+func Start(logger xlog.Logger, ignoreCertificateErrors bool) error {
 	const op string = "chrome.Start"
 	logger.DebugOp(op, "starting new Google Chrome headless process on port 9222...")
 	resolver := func() error {
-		cmd, err := cmd(logger)
+		cmd, err := cmd(logger, ignoreCertificateErrors)
 		if err != nil {
 			return err
 		}
@@ -32,7 +32,7 @@ func Start(logger xlog.Logger) error {
 		// if the process failed to start correctly,
 		// we have to restart it.
 		if !isViable(logger) {
-			return restart(logger, cmd.Process)
+			return restart(logger, cmd.Process, ignoreCertificateErrors)
 		}
 		return nil
 	}
@@ -42,7 +42,7 @@ func Start(logger xlog.Logger) error {
 	return nil
 }
-func cmd(logger xlog.Logger) (*exec.Cmd, error) {
+func cmd(logger xlog.Logger, ignoreCertificateErrors bool) (*exec.Cmd, error) {
 	const op string = "chrome.cmd"
 	binary := "google-chrome-stable"
 	args := []string{
@@ -66,6 +66,11 @@ func cmd(logger xlog.Logger) (*exec.Cmd, error) {
 		"--mute-audio",
 		"--no-first-run",
 	}
 	if ignoreCertificateErrors {
 		args = append(args, "--ignore-certificate-errors")
 	}
 	cmd, err := xexec.Command(logger, binary, args...)
 	if err != nil {
 		return nil, xerror.New(op, err)
@@ -93,7 +98,7 @@ func kill(logger xlog.Logger, proc *os.Process) error {
 	return nil
 }
-func restart(logger xlog.Logger, proc *os.Process) error {
+func restart(logger xlog.Logger, proc *os.Process, ignoreCertificateErrors bool) error {
 	const op string = "chrome.restart"
 	logger.DebugOp(op, "restarting Google Chrome headless process using port 9222...")
 	resolver := func() error {
@@ -101,7 +106,7 @@ func restart(logger xlog.Logger, proc *os.Process) error {
 		if err := kill(logger, proc); err != nil {
 			return err
 		}
-		cmd, err := cmd(logger)
+		cmd, err := cmd(logger, ignoreCertificateErrors)
 		if err != nil {
 			return err
 		}
@@ -113,7 +118,7 @@ func restart(logger xlog.Logger, proc *os.Process) error {
 		// if the process failed to restart correctly,
 		// we have to restart it again.
 		if !isViable(logger) {
-			return restart(logger, cmd.Process)
+			return restart(logger, cmd.Process, ignoreCertificateErrors)
 		}
 		return nil
 	}
--- a/internal/pkg/conf/conf.go
+++ b/internal/pkg/conf/conf.go
@@ -40,6 +40,9 @@ const (
 	// DefaultGoogleChromeRpccBufferSizeEnvVar contains the name
 	// of the environment variable "DEFAULT_GOOGLE_CHROME_RPCC_BUFFER_SIZE".
 	DefaultGoogleChromeRpccBufferSizeEnvVar string = "DEFAULT_GOOGLE_CHROME_RPCC_BUFFER_SIZE"
 	// GoogleChromeIgnoreCertificateErrorsEnvVar contains the name
 	// of the environment variable "GOOGLE_CHROME_IGNORE_CERTIFICATE_ERRORS".
 	GoogleChromeIgnoreCertificateErrorsEnvVar string = "GOOGLE_CHROME_IGNORE_CERTIFICATE_ERRORS"
 )
 // Config contains the application
@@ -53,6 +56,7 @@ type Config struct {
 	defaultListenPort                   int64
 	disableGoogleChrome                 bool
 	disableUnoconv                      bool
 	googleChromeIgnoreCertificateErrors bool
 	logLevel                            xlog.Level
 	rootPath                            string
 	maximumGoogleChromeRpccBufferSize   int64
@@ -75,6 +79,7 @@ func DefaultConfig() Config {
 		rootPath:                            "/",
 		maximumGoogleChromeRpccBufferSize:   104857600, // ~100 MB
 		defaultGoogleChromeRpccBufferSize:   1048576,   // 1 MB
 		googleChromeIgnoreCertificateErrors: false,
 	}
 }
@@ -188,6 +193,14 @@ func FromEnv() (Config, error) {
 		if err != nil {
 			return c, err
 		}
 		googleChromeIgnoreCertificateErrors, err := xassert.BoolFromEnv(
 			GoogleChromeIgnoreCertificateErrorsEnvVar,
 			c.googleChromeIgnoreCertificateErrors,
 		)
 		c.googleChromeIgnoreCertificateErrors = googleChromeIgnoreCertificateErrors
 		if err != nil {
 			return c, err
 		}
 		return c, nil
 	}
 	result, err := resolver()
@@ -274,3 +287,7 @@ func (c Config) MaximumGoogleChromeRpccBufferSize() int64 {
 func (c Config) DefaultGoogleChromeRpccBufferSize() int64 {
 	return c.defaultGoogleChromeRpccBufferSize
 }
 func (c Config) GoogleChromeIgnoreCertificateErrors() bool {
 	return c.googleChromeIgnoreCertificateErrors
 }
--- a/internal/pkg/conf/conf_test.go
+++ b/internal/pkg/conf/conf_test.go
@@ -380,6 +380,43 @@ func TestDefaultGoogleChromeRpccBufferSizeFromEnv(t *testing.T) {
 	os.Unsetenv(DefaultGoogleChromeRpccBufferSizeEnvVar)
 }
 func TestGoogleChromeIgnoreCertificateErrorsFromEnv(t *testing.T) {
 	var (
 		expected Config
 		result   Config
 		err      error
 	)
 	// GOOGLE_CHROME_IGNORE_CERTIFICATE_ERRORS correctly set to true.
 	os.Setenv(GoogleChromeIgnoreCertificateErrorsEnvVar, "1")
 	expected = DefaultConfig()
 	expected.googleChromeIgnoreCertificateErrors = true
 	result, err = FromEnv()
 	assert.Nil(t, err)
 	assert.Equal(t, expected, result)
 	os.Unsetenv(GoogleChromeIgnoreCertificateErrorsEnvVar)
 	// GOOGLE_CHROME_IGNORE_CERTIFICATE_ERRORS correctly set to false.
 	os.Setenv(GoogleChromeIgnoreCertificateErrorsEnvVar, "0")
 	expected = DefaultConfig()
 	expected.googleChromeIgnoreCertificateErrors = false
 	result, err = FromEnv()
 	assert.Nil(t, err)
 	assert.Equal(t, expected, result)
 	os.Unsetenv(GoogleChromeIgnoreCertificateErrorsEnvVar)
 	// GOOGLE_CHROME_IGNORE_CERTIFICATE_ERRORS wrongly set.
 	os.Setenv(GoogleChromeIgnoreCertificateErrorsEnvVar, "foo")
 	expected = DefaultConfig()
 	result, err = FromEnv()
 	test.AssertError(t, err)
 	assert.Equal(t, expected, result)
 	os.Unsetenv(GoogleChromeIgnoreCertificateErrorsEnvVar)
 	// GOOGLE_CHROME_IGNORE_CERTIFICATE_ERRORS not set at all.
 	expected = DefaultConfig()
 	expected.googleChromeIgnoreCertificateErrors = false
 	result, err = FromEnv()
 	assert.Nil(t, err)
 	assert.Equal(t, expected, result)
 }
 func TestGetters(t *testing.T) {
 	result := DefaultConfig()
 	assert.Equal(t, result.maximumWaitTimeout, result.MaximumWaitTimeout())
@@ -394,4 +431,5 @@ func TestGetters(t *testing.T) {
 	assert.Equal(t, result.rootPath, result.RootPath())
 	assert.Equal(t, result.maximumGoogleChromeRpccBufferSize, result.MaximumGoogleChromeRpccBufferSize())
 	assert.Equal(t, result.defaultGoogleChromeRpccBufferSize, result.DefaultGoogleChromeRpccBufferSize())
 	assert.Equal(t, result.googleChromeIgnoreCertificateErrors, result.GoogleChromeIgnoreCertificateErrors())
 }
--- a/internal/pkg/printer/chrome.go
+++ b/internal/pkg/printer/chrome.go
@@ -94,7 +94,7 @@ func (p chromePrinter) Print(destination string) error {
 		if err != nil {
 			return err
 		}
-		defer devtConn.Close() // nolint: errcheck
+		defer devtConn.Close()
 		// create a new CDP Client that uses conn.
 		devtClient := cdp.NewClient(devtConn)
 		createBrowserContextArgs := target.NewCreateBrowserContextArgs()
@@ -136,7 +136,7 @@ func (p chromePrinter) Print(destination string) error {
 		if err != nil {
 			return err
 		}
-		defer newContextConn.Close() // nolint: errcheck
+		defer newContextConn.Close()
 		// create a new CDP Client that uses newContextConn.
 		targetClient := cdp.NewClient(newContextConn)
 		/*
@@ -314,22 +314,22 @@ func (p chromePrinter) listenEvents(ctx context.Context, client *cdp.Client) err
 		if err != nil {
 			return err
 		}
-		defer domContentEventFired.Close() // nolint: errcheck
+		defer domContentEventFired.Close()
 		loadEventFired, err := client.Page.LoadEventFired(ctx)
 		if err != nil {
 			return err
 		}
-		defer loadEventFired.Close() // nolint: errcheck
+		defer loadEventFired.Close()
 		lifecycleEvent, err := client.Page.LifecycleEvent(ctx)
 		if err != nil {
 			return err
 		}
-		defer lifecycleEvent.Close() // nolint: errcheck
+		defer lifecycleEvent.Close()
 		loadingFinished, err := client.Network.LoadingFinished(ctx)
 		if err != nil {
 			return err
 		}
-		defer loadingFinished.Close() // nolint: errcheck
+		defer loadingFinished.Close()
 		if _, err := client.Page.Navigate(ctx, page.NewNavigateArgs(p.url)); err != nil {
 			return err
 		}
--- a/internal/pkg/printer/markdown.go
+++ b/internal/pkg/printer/markdown.go
@@ -3,15 +3,14 @@ package printer
 import (
 	"bytes"
 	"fmt"
 	"html/template"
 	"io/ioutil"
 	"path/filepath"
 	"github.com/microcosm-cc/bluemonday"
 	"github.com/russross/blackfriday/v2"
 	"github.com/thecodingmachine/gotenberg/internal/pkg/xerror"
 	"github.com/thecodingmachine/gotenberg/internal/pkg/xlog"
 	"github.com/thecodingmachine/gotenberg/internal/pkg/xrand"
 	"html/template"
 	"io/ioutil"
 	"path/filepath"
 )
 // NewMarkdownPrinter returns a Printer which
@@ -58,6 +57,8 @@ type templateData struct {
 func markdownToHTML(dirPath, filename string) (template.HTML, error) {
 	const op string = "printer.markdownToHTML"
 	// avoid directory traversal.
 	filename = filepath.Base(filename)
 	fpath := fmt.Sprintf("%s/%s", dirPath, filename)
 	b, err := ioutil.ReadFile(fpath)
 	if err != nil {
--- a/internal/pkg/printer/office.go
+++ b/internal/pkg/printer/office.go
@@ -94,13 +94,14 @@ func (p officePrinter) Print(destination string) error {
 func (p officePrinter) unoconv(ctx context.Context, fpath, destination string) error {
 	const op string = "printer.unoconv"
 	resolver := func() error {
 		dirName := xrand.Get()
 		port, err := freeport.GetFreePort()
 		if err != nil {
 			return err
 		}
 		args := []string{
 			"--user-profile",
-			fmt.Sprintf("///tmp/%d", port),
+			fmt.Sprintf("///tmp/%s", dirName),
 			"--port",
 			fmt.Sprintf("%d", port),
 			"--format",
@@ -116,11 +117,7 @@ func (p officePrinter) unoconv(ctx context.Context, fpath, destination string) e
 		err = xexec.Run(ctx, p.logger, "unoconv", args...)
 		// always remove user profile folders created by LibreOffice.
 		// see https://github.com/thecodingmachine/gotenberg/issues/192.
-		userProfileDirPath := fmt.Sprintf("/tmp/%d", port)
+		go cleanupUserProfile(p.logger, dirName)
 		if err := os.RemoveAll(userProfileDirPath); err != nil {
 			// find a way to bubble up this error?
 			p.logger.ErrorOpf(op, "failed to remove user profile directory '%s': %s", userProfileDirPath, err.Error())
 		}
 		if err != nil {
 			// find a way to check it in the handlers?
 			if p.opts.PageRanges != "" && strings.Contains(err.Error(), "exit status 5") {
@@ -140,6 +137,15 @@ func (p officePrinter) unoconv(ctx context.Context, fpath, destination string) e
 	return nil
 }
 func cleanupUserProfile(logger xlog.Logger, dirName string) {
 	const op = "printer.cleanupUserProfile"
 	path := fmt.Sprintf("/tmp/%s", dirName)
 	if err := os.RemoveAll(path); err != nil {
 		// find a way to bubble up this error?
 		logger.ErrorOpf(op, "failed to remove user profile directory '%s': %s", path, err.Error())
 	}
 }
 // Compile-time checks to ensure type implements desired interfaces.
 var (
 	_ = Printer(new(officePrinter))
--- a/internal/pkg/xexec/xexec.go
+++ b/internal/pkg/xexec/xexec.go
@@ -139,7 +139,7 @@ func logCommandOutput(logger xlog.Logger, reader io.ReadCloser, outputType strin
 	}
 	op := buf.String()
 	r := bufio.NewReader(reader)
-	defer reader.Close() // nolint: errcheck
+	defer reader.Close()
 	for {
 		line, _, err := r.ReadLine()
 		if err != nil {
--- a/test/cmd/chrome.go
+++ b/test/cmd/chrome.go
@@ -14,7 +14,7 @@ func main() {
 		systemLogger.FatalOp(op, err)
 	}
 	// start Google Chrome headless.
-	if err := chrome.Start(systemLogger); err != nil {
+	if err := chrome.Start(systemLogger, config.GoogleChromeIgnoreCertificateErrors()); err != nil {
 		systemLogger.FatalOp(op, err)
 	}
 }
Author	SHA1	Message	Date
Julien Neuhart	daf028ab2b	Merge pull request #208 from thecodingmachine/6.3.0-dev 6.3.0	2020-06-22 10:58:01 +02:00
Julien Neuhart	5467620b32	adding warning about URL conversion to a Docker Compose service named app	2020-06-09 16:38:28 +02:00
Julien Neuhart	a3cae0f094	Merge branch '6.3.0-dev' of https://github.com/thecodingmachine/gotenberg into 6.3.0-dev	2020-06-09 16:30:22 +02:00
Julien Neuhart	f74eea4314	Merge pull request #204 from WillyReyno/patch-1 Added warning for URLRequest and service named app	2020-06-09 16:30:05 +02:00
Julien Neuhart	04e930a766	fixing typos in documentation	2020-06-09 16:29:14 +02:00
Julien Neuhart	89ac13e805	Fixing linter issues	2020-06-08 10:44:46 +02:00
Julien Neuhart	0b86d38517	go fmt and regenerating documentation	2020-06-08 09:44:37 +02:00
Julien Neuhart	7e76809860	Merge pull request #206 from tomjvdberg/URL-allow-insecure-connection Url allow insecure connection	2020-06-08 09:28:38 +02:00
tomjvdberg	4d46b98e7f	Apply suggestions from code review Co-authored-by: Julien Neuhart <j.neuhart@thecodingmachine.com>	2020-06-08 08:31:57 +02:00
Julien Neuhart	6c1a46aee5	minor update of the documentation	2020-06-05 15:56:07 +02:00
Julien Neuhart	a7cef5a1c6	got fmt	2020-06-05 15:05:51 +02:00
Julien Neuhart	8a218a6626	using a (more) random directory name for user profile tmp dir + improving performance with a go routine	2020-06-05 15:05:27 +02:00
Julien Neuhart	542fe18dcd	avoir directory traversal when uploading a file	2020-06-05 12:06:01 +02:00
Julien Neuhart	25f18ac951	fixing dependencies with master	2020-06-05 12:03:16 +02:00
Julien Neuhart	5540438595	adding missing comment from previous commit	2020-06-05 12:00:57 +02:00
Julien Neuhart	b25456835a	sanitizing filename parameter of toHTML function	2020-06-05 11:52:17 +02:00
Julien Neuhart	f86091382f	updating dependencies	2020-06-05 09:19:31 +02:00
Julien Neuhart	dbdf8871cc	tini no more writeable by gotenberg user	2020-06-05 09:19:12 +02:00
Tom van den Berg	1e6926ee2d	Add ignoreCertificateErrors tests + docs	2020-06-02 16:06:17 +02:00
Tom van den Berg	24cbe98ac2	Add feature to have chrome ignore certificate errors when printing using an URL.	2020-06-01 15:31:36 +02:00
Willy Reyno	c590b026d6	Added warning for URLRequest and service named app A docker-compose service named "app" will systematically return a blank PDF when using `URLRequest()`. Added a warning to recommend people to rename their service if it's named "app".	2020-06-01 11:15:55 +02:00
Julien Neuhart	d28221aec9	Merge pull request #196 from thecodingmachine/dependabot/go_modules/github.com/sirupsen/logrus-1.6.0 Bump github.com/sirupsen/logrus from 1.5.0 to 1.6.0	2020-05-04 08:32:27 +02:00
dependabot-preview[bot]	df0c6c8c2d	Bump github.com/sirupsen/logrus from 1.5.0 to 1.6.0 Bumps [github.com/sirupsen/logrus](https://github.com/sirupsen/logrus) from 1.5.0 to 1.6.0. - [Release notes](https://github.com/sirupsen/logrus/releases) - [Changelog](https://github.com/sirupsen/logrus/blob/master/CHANGELOG.md) - [Commits](https://github.com/sirupsen/logrus/compare/v1.5.0...v1.6.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-05-04 05:06:23 +00:00