Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add protocols related metrics #816

Merged
merged 23 commits into from
Nov 11, 2020
Merged

Add protocols related metrics #816

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
45f4128
Prevent milestones events from being sent from iframes
gmetais Oct 9, 2020
366b210
Catch http and tls protocols versions from responses
gmetais Oct 9, 2020
9bc69fa
Merge with Prettier
gmetais Oct 9, 2020
409e960
Prettier
gmetais Nov 1, 2020
c4f60d0
HTTP and TLS protocols metrics
gmetais Nov 2, 2020
a7952d2
Merge branch 'devel' of https://github.com/macbre/phantomas into devel
gmetais Nov 2, 2020
51445f2
Merge branch 'devel' into protocols
gmetais Nov 2, 2020
ecb2252
Lint
gmetais Nov 2, 2020
91fe2a3
Merge branch 'devel' into protocols
macbre Nov 4, 2020
0f57dfd
Add viewport extension into metadata
gmetais Nov 5, 2020
a392d8d
Regenerate docs for the new protocols module
gmetais Nov 6, 2020
de2783d
Try to add an SSL certificate to nginx (not working)
gmetais Nov 6, 2020
67dbc8e
Add integration tests for the protocols module
gmetais Nov 6, 2020
4cb250a
Merge branch 'protocols' of https://github.com/gmetais/phantomas into…
gmetais Nov 6, 2020
0c725d3
Run Prettier
gmetais Nov 6, 2020
0cc995c
Merge branch 'devel' into protocols
macbre Nov 9, 2020
f580e36
Update test/nginx-docker-compose.yaml
macbre Nov 9, 2020
0ac6bf3
Merge branch 'devel' into protocols
macbre Nov 9, 2020
9638d95
Merge branch 'devel' into protocols
macbre Nov 9, 2020
c406ec2
test/integration-spec.yaml: fix assertions and ignoreSslErrors option
macbre Nov 9, 2020
b5043cf
Merge branch 'devel' into protocols
macbre Nov 9, 2020
383c1de
Merge branch 'devel' into protocols
macbre Nov 9, 2020
e32c31f
Merge branch 'devel' into protocols
macbre Nov 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions test/nginx-docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ services:
image: macbre/nginx-brotli:1.19.3
Copy link
Owner

@macbre macbre Nov 9, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
image: macbre/nginx-brotli:1.19.3
image: macbre/nginx-brotli:1.19.4

This solves problems with SSL (1.19.3 image had an issue with nginx build) - see macbre/docker-nginx-http3#15

Copy link
Owner

@macbre macbre Nov 9, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmetais - now we have

 localhost but https version
    ✗ should be generated 
        » No error should be thrown: got Error: net::ERR_CERT_AUTHORITY_INVALID at https://127.0.0.1:8889 // /home/runner/work/phantomas/phantomas/node_modules/vows/lib/assert/macros.js:31

We need to pass a different option to puppeteer -> https://github.com/puppeteer/puppeteer/blob/main/docs/api.md#puppeteerlaunchoptions (ignoreHTTPSErrors)

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FIxed in #821

ports:
- "8888:80"
- "8889:443"
volumes:
# see nginx-static.conf
- "./webroot:/static"
- "./nginx-static.conf:/etc/nginx/conf.d/nginx-static.conf"
- "./ssl-certificate/localhost.crt:/etc/nginx/localhost.crt"
- "./ssl-certificate/localhost.key:/etc/nginx/localhost.key"
16 changes: 16 additions & 0 deletions test/nginx-static.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,19 @@ server {
expires 1h;
}
}

server {
listen 443 ssl;
server_name localhost;

ssl_certificate /etc/nginx/localhost.crt;
ssl_certificate_key /etc/nginx/localhost.key;
ssl_ciphers HIGH:!aNULL:!MD5;
ssl_protocols TLSv1.1;

root /static;

location / {
autoindex on;
}
}
21 changes: 21 additions & 0 deletions test/ssl-certificate/localhost.crt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
-----BEGIN CERTIFICATE-----
MIIDZzCCAk+gAwIBAgIJAKW2p+vHBsVmMA0GCSqGSIb3DQEBCwUAMEoxCzAJBgNV
BAYTAlBMMRMwEQYDVQQIDApTb21lLVN0YXRlMRIwEAYDVQQKDAlwaGFudG9tYXMx
EjAQBgNVBAMMCWxvY2FsaG9zdDAeFw0yMDExMDUyMTEyNTFaFw0yMTExMDUyMTEy
NTFaMEoxCzAJBgNVBAYTAlBMMRMwEQYDVQQIDApTb21lLVN0YXRlMRIwEAYDVQQK
DAlwaGFudG9tYXMxEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEB
BQADggEPADCCAQoCggEBAKE7/mFm+qzx2jy2iRuMKhXAJboV+71PXN8DdUrSA32d
S0FRxkWx70mdTAhwV/GvwxX5L45Di+3GFtAnaislxWGtmheraNf0ByCOMs6I3Dih
qQ3czpvGCviv4f5swhl6QTGyvLwDodXjfydW5F++FmchDfylU2mhRjACbEs4Ck8c
ijahk5FnCPFQEzE8LMNiOYD3p5flzwUMy0el93PoNNd1zLWjYXS0IvlSz1huVhUq
ETWPU6y/mvIdUhJSLvhWHxkOABRHdxe8biRCfD3zuhubVVydlVfAOU+fcWb5/ATy
Tc+9KTG4BnAqeK7QnSlyjUkGaI6CMP6tGWUjj9qKb3cCAwEAAaNQME4wHQYDVR0O
BBYEFI3RAwNpRWCYXYgOf4/OBYpp34xmMB8GA1UdIwQYMBaAFI3RAwNpRWCYXYgO
f4/OBYpp34xmMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAGRgqtAq
VjS4yMzEd+KMEKs2EQ5U5OAEYHlmi9kQtyp8QlJSrQbgC5ABJ3iOwM/U0sxT/gMi
ESeN1y1G6qPmN57OKxrLuf3DtQAz+QRmNiC17skQzLC3HUXwWKojFyUeJJFkmSKH
NeUET7LnCC7KuhU0Dgf/VtB5K34OJt9no7x53S/QrdM3ibG+ZwJjxCZPOG27Hw/d
u6e/O30X7G5vsZ2GWwwauNSn4rgvs40SJQY1mKBSc3OKkSCMQlZnjeJbLQKSk7St
qhiJvJwTYX+f9MeVL8iRbdKySObeLtYBMJLR+oat0Plb1ExWr+PqVpXsrfJgx5jC
EtR+vOmUZCMHOow=
-----END CERTIFICATE-----
28 changes: 28 additions & 0 deletions test/ssl-certificate/localhost.key
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
-----BEGIN PRIVATE KEY-----
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQChO/5hZvqs8do8
tokbjCoVwCW6Ffu9T1zfA3VK0gN9nUtBUcZFse9JnUwIcFfxr8MV+S+OQ4vtxhbQ
J2orJcVhrZoXq2jX9AcgjjLOiNw4oakN3M6bxgr4r+H+bMIZekExsry8A6HV438n
VuRfvhZnIQ38pVNpoUYwAmxLOApPHIo2oZORZwjxUBMxPCzDYjmA96eX5c8FDMtH
pfdz6DTXdcy1o2F0tCL5Us9YblYVKhE1j1Osv5ryHVISUi74Vh8ZDgAUR3cXvG4k
Qnw987obm1VcnZVXwDlPn3Fm+fwE8k3PvSkxuAZwKniu0J0pco1JBmiOgjD+rRll
I4/aim93AgMBAAECggEAXTtbtObfPPH8x+6lCZDbJQieyCO+FZG2mh5dzI30BsbV
pUer5tElFOQn+xk7QT3pCOO2ZAUa/Lr2phakhZ6pq/m+iMFNNtKc7G5NYrAw525T
Wvi7X8f8wCC0BXLOKf1PhXVdPTq8cfnCpPTRyasZOTkb5WOUABiJhWlhRX16OJPV
PacBvD1yUQlmgfloOlk55ODh6JyQ+geYYZIjAemlo3Q7i5BK1Qx28h/16MQWYmNX
MPuCMBpiH7TBxv5QTMTSouL+VTy2ooTrPoppUv0GYEh0rNNkj02eOLu1d0uEpWHD
CRj9/lm0xcwZjMh+7gpLXMM5/umbaylleF7p7HyyQQKBgQDNxiGEO+Mlt9+5mweZ
xxmU35BF2tniVsg9a1T9ywM0UrYeB6by9OXHXknd1EvMjHNFN7YXB4JMA9DPC7Jg
XhgZr1IUM/UEk73iUGpzygWKGp2iU7ogwV/sHfRbDvIJRp1+6pqSMgnHh1xd6vz/
3ZLEiFB9MOq4a5GPxHJh90RVdQKBgQDIlsmrjKTq2sj7o0jFb5nXLFQmmxBmO2xe
BmYFXBGJRBni4t4tuFbliC5y46s3gfJzAhmGtqoUxFC3lYMrUaDegRi0UaD/ycsc
2sb02lo1pHpXnOkssUZS4S+O1rNKctgu2wB+vPCknvoZhBi1u8nHhCNrDcznRprN
w3dIuViXuwKBgQCKamBZRr+Au7Lucu4l7tuyXL/7fT9bFO0VA4HkRg8dvxVqFdOj
UkDOXwppAUkLit5vDQ6bZx2qbFalL0UJtcGYZWpc1KZYMdlkxpsU0Cvxvf2TF6b4
KZuQhIW+SstcmfePS9g1xxr08ISdWFhe9HipYthhneoFq7X6czZN17pLkQKBgBc0
Ah4bBdS4/DjHmZplH3mZgh55H3uD8jQqL1D9ZnXnb8skDSliwoKIrz7RATRJjt8o
5gUESkZesyuZWvP+3EoAyvfI3YPZNuqekBcwzvCXlyNdXkeyNf1OWS7/vPumr0U0
Rili979DOJENC8Kx91Rh/6rZjNNQAoY8zyaVch8TAoGAUAn7EGvUeFH/FI85/BPD
dZprEUWf2oM0/5G76IGGW0gWJlW0qx8Y3/q8K4i1EEEfKWkqOGpzy7PSRSEcMDrx
TzrhHEXZSX+kKOaFv8aHyJ1EpQ0ry94GcfiPRt6Jmbn66DeXFO16P53WhOxYLNY1
8/yor/oxl8g4gTNXBkSv31E=
-----END PRIVATE KEY-----