From 0f18e65537c16cb82bbcd90987396e9222376a2a Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Tue, 27 Feb 2024 09:31:35 -0700 Subject: [PATCH] iscn5cg3256cps.infineon.com --- .gitignore | 1 + .vscode/settings.json | 3 +- conf/includes/BaGet.conf | 12 ++--- conf/includes/default.conf | 8 ++++ conf/includes/dex.conf | 21 +++++++++ .../includes/iscn5cg3256cps.infineon.com.conf | 33 +++++++++++++ conf/includes/iscn5cg3256cps.infineon.com.crt | 25 ++++++++++ conf/includes/iscn5cg3256cps.infineon.com.key | 28 +++++++++++ conf/includes/json.conf | 41 ++++++++++++---- conf/includes/wwwroot.conf | 4 ++ conf/nginx.conf | 47 ++++++++----------- 11 files changed, 179 insertions(+), 44 deletions(-) create mode 100644 .gitignore create mode 100644 conf/includes/default.conf create mode 100644 conf/includes/dex.conf create mode 100644 conf/includes/iscn5cg3256cps.infineon.com.conf create mode 100644 conf/includes/iscn5cg3256cps.infineon.com.crt create mode 100644 conf/includes/iscn5cg3256cps.infineon.com.key create mode 100644 conf/includes/wwwroot.conf diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3b1b42c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +nginx-1.20.1 \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 261bf63..bc8e09f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,5 +6,6 @@ "files.exclude": { "**/.git": false }, - "coverage-gutters.coverageBaseDir": "./.vscode/ReportGenerator/Cobertura/*" + "coverage-gutters.coverageBaseDir": "./.vscode/ReportGenerator/Cobertura/*", + "thunder-client.saveToWorkspace": false } \ No newline at end of file diff --git a/conf/includes/BaGet.conf b/conf/includes/BaGet.conf index dd8900e..a51479d 100644 --- a/conf/includes/BaGet.conf +++ b/conf/includes/BaGet.conf @@ -1,11 +1,11 @@ -location / -{ - proxy_pass http://localhost:5555; +location / { proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection keep-alive; - proxy_set_header Host $http_host; proxy_cache_bypass $http_upgrade; + proxy_pass http://localhost:5555; + proxy_set_header Host $http_host; + proxy_set_header Connection keep-alive; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header X-Forwarded-Proto https; } # sc create "Baget-5555" start= delayed-auto DisplayName="Baget-5555" binPath= "C:\Users\phares\AppData\Local\IFXApps\BaGet\src\BaGet\bin\Release\net6.0\win-x64\publish\BaGet.exe" obj= "infineon\phares" password= "" diff --git a/conf/includes/default.conf b/conf/includes/default.conf new file mode 100644 index 0000000..c6b4fe2 --- /dev/null +++ b/conf/includes/default.conf @@ -0,0 +1,8 @@ +server { + listen 8008 default_server; + listen [::]:8008 default_server; + ## Trun on /cgi-bin/ support to run CGI apps ## + include /etc/nginx/fcgiwrap.conf; + root /var/www/html; + server_name _; +} diff --git a/conf/includes/dex.conf b/conf/includes/dex.conf new file mode 100644 index 0000000..fca3a3c --- /dev/null +++ b/conf/includes/dex.conf @@ -0,0 +1,21 @@ +location ~* .(3gp|apng|avi|avif|bmp|css|cur|flv|gif|htm|html|ico|jfif|jpeg|jpg|js|mid|mov|mp3|mp4|mpeg|mpg|ogg|pdf|php|pjp|pjpeg|png|svg|tif|tiff|txt|wav|webp|wmf|wml|wmv|xml|xml)$ { + expires 1d; + index index.html index.htm; + # root /var/www/html/637998119172547651; + root "D://Tmp//phares//www"; +} +location / { + index index.html index.htm; + # root /var/www/html/637998119172547651; + root "D://Tmp//phares//www"; + # First attempt to serve request as file, then + autoindex on; + # Send the data in JSON + autoindex_format json; + addition_types application/json; + # Calling from SERVERNAME/autoindex/* + add_before_body /NGINdeX.io/header.html; + add_after_body /NGINdeX.io/footer.html; + # Need to tell that we are sending HTML + add_header Content-Type text/html; +} \ No newline at end of file diff --git a/conf/includes/iscn5cg3256cps.infineon.com.conf b/conf/includes/iscn5cg3256cps.infineon.com.conf new file mode 100644 index 0000000..198c51b --- /dev/null +++ b/conf/includes/iscn5cg3256cps.infineon.com.conf @@ -0,0 +1,33 @@ +[req] +default_bits = 2048 +default_keyfile = localhost.key +distinguished_name = req_distinguished_name +req_extensions = req_ext +x509_extensions = v3_ca + +[req_distinguished_name] +countryName = Country Name (2 letter code) +countryName_default = US +stateOrProvinceName = State or Province Name (full name) +stateOrProvinceName_default = Arizona +localityName = Locality Name (eg, city) +localityName_default = Mesa +organizationName = Organization Name (eg, company) +organizationName_default = Infineon Technologies Americas Corp. +organizationalUnitName = organizationalunit +organizationalUnitName_default = Development +commonName = Common Name (e.g. server FQDN or YOUR name) +commonName_default = iscn5cg3256cps.infineon.com +commonName_max = 64 + +[req_ext] +subjectAltName = @alt_names + +[v3_ca] +subjectAltName = @alt_names + +[alt_names] +DNS.1 = iscn5cg3256cps.infineon.com +DNS.2 = iscn5cg3256cps +DNS.3 = localhost +DNS.4 = 127.0.0.1 \ No newline at end of file diff --git a/conf/includes/iscn5cg3256cps.infineon.com.crt b/conf/includes/iscn5cg3256cps.infineon.com.crt new file mode 100644 index 0000000..682e03e --- /dev/null +++ b/conf/includes/iscn5cg3256cps.infineon.com.crt @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIEMTCCAxmgAwIBAgIUUi/nacInzoq78JsuzLhWssBY2iQwDQYJKoZIhvcNAQEL +BQAwgZkxCzAJBgNVBAYTAlVTMRAwDgYDVQQIDAdBcml6b25hMQ0wCwYDVQQHDARN +ZXNhMS0wKwYDVQQKDCRJbmZpbmVvbiBUZWNobm9sb2dpZXMgQW1lcmljYXMgQ29y +cC4xFDASBgNVBAsMC0RldmVsb3BtZW50MSQwIgYDVQQDDBtpc2NuNWNnMzI1NmNw +cy5pbmZpbmVvbi5jb20wHhcNMjQwMjI3MTYyNzI0WhcNMjUwMjI2MTYyNzI0WjCB +mTELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB0FyaXpvbmExDTALBgNVBAcMBE1lc2Ex +LTArBgNVBAoMJEluZmluZW9uIFRlY2hub2xvZ2llcyBBbWVyaWNhcyBDb3JwLjEU +MBIGA1UECwwLRGV2ZWxvcG1lbnQxJDAiBgNVBAMMG2lzY241Y2czMjU2Y3BzLmlu +ZmluZW9uLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKYnR9hK +CCBCvENd4nr0RcKsxiSvWJnF+tt6dtxdvRQFc01JTFuslyA8fv33HvIi8hlNF0H9 +r3tMQ8G0cR3Fhl4OiryORg7kDSKvHD3dm6w915a08TwumC1+A7u9kB43WwrxsqoC +Afmm+t0F0nKqHjeu8kvMr2szcu08xpwvJGu3Yo1VraHlX/36BVLLg12LUle4A4gw +D3gIJijXOCOkxkPkHx7y7mJUIBrtrQ9O1M3u7H3f2NF7yvwgdK61tHHQQ6CIT6Up +1TIwrPwb23/PXSU+Hv9brYGOSermjaUys6dNssCU6yU/9L7Z3C7QpFomv+NINQ0o +pra1CAHTd5qb5YECAwEAAaNvMG0wTAYDVR0RBEUwQ4IbaXNjbjVjZzMyNTZjcHMu +aW5maW5lb24uY29tgg5pc2NuNWNnMzI1NmNwc4IJbG9jYWxob3N0ggkxMjcuMC4w +LjEwHQYDVR0OBBYEFAuC8Lfjj1kUP5JYgjX8qJBVQNN+MA0GCSqGSIb3DQEBCwUA +A4IBAQCEUC+V5X5Yn5FuuRCA0ZRvUHXS5VDC5MV0XJ06ZyL3JuEFsvl/eSb6e2/d +zMQXKVRhkwOuuk/9YFrA+AkVlfdjLsJhDUjluQLAl3XfEFkQ2VcD8aMn8YSmX4Uu +jMvOOK+82QNjseYk5T9hi86RwYBVLHORSsop4zzk4kPBIzqHB2jNQKVyMU1O0DMD +Sanaupg9+SJRmkhxJ7UuAZ5V7SPI1E90FH2zZG4XAxVNb1R0j8XSK8kXTZAOWzJe +2JVAjpEvhBkDXigF3tc9EOSlgEzIVUak1FGane5aj7fWoasV5Jp2JI58MDZhi2gw +6anI6RJpw7XkqPGODNlMJwjdfqHD +-----END CERTIFICATE----- diff --git a/conf/includes/iscn5cg3256cps.infineon.com.key b/conf/includes/iscn5cg3256cps.infineon.com.key new file mode 100644 index 0000000..72caf3f --- /dev/null +++ b/conf/includes/iscn5cg3256cps.infineon.com.key @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCmJ0fYSgggQrxD +XeJ69EXCrMYkr1iZxfrbenbcXb0UBXNNSUxbrJcgPH799x7yIvIZTRdB/a97TEPB +tHEdxYZeDoq8jkYO5A0irxw93ZusPdeWtPE8LpgtfgO7vZAeN1sK8bKqAgH5pvrd +BdJyqh43rvJLzK9rM3LtPMacLyRrt2KNVa2h5V/9+gVSy4Ndi1JXuAOIMA94CCYo +1zgjpMZD5B8e8u5iVCAa7a0PTtTN7ux939jRe8r8IHSutbRx0EOgiE+lKdUyMKz8 +G9t/z10lPh7/W62Bjknq5o2lMrOnTbLAlOslP/S+2dwu0KRaJr/jSDUNKKa2tQgB +03eam+WBAgMBAAECggEABOjCdUwrrQtXvWxR16TtxjydXqJdLW71dGRsDGMLJgMq +ttkAc/F3piTPckDJ1ejtKwz1b9ZXZ97XHisvD+yBBbirhfp0rLY1gqW2oYfRlI9f +tjTar1bnmWmAofyN/GyRiLNfPmlwhkA2J49nWkq3OZk2UMHHmZTjs4mBC0aTzoho +cy41HSRCqBsv9QwYk1vfI8V877K3t7Gs+Zbn+k+PzKL/FMveGdhK7hyfItOhfLoE +k9lf2F6aPia7Z2u8ao2p1y15LqwlFxWf0exMyKTDcptoOAtrVG0QZibKCKDw6Eun +8pmkkNowgg1a4fDut5rTGLX95nUtf/jbg2kDtxhboQKBgQDl8h0vun2tEQUv87bq +mprpMkZS06jx6gEV8Jh8eYfawUQNlQSeYF05ZzCkTH8TXim+qCJGIOcoPbfBQx10 +1HRL7374y8O9Top2d43Q2yKrUVsVhH70GgLefz3yGe8Kj3YyHUxU0YswHDvVdkHb +IOdTln3SPe8DWm06TU9HJab80QKBgQC4+sjfB26ZrOgiIqwBdTnAiCsdTd286FJd +gi4qV3Zs3SnltPh9SwnrQmGyY0pmrf0pOa2M6BS2NejqqX+DtkT+iaWw7Z23nPT4 +fZCsxKEMZ+CdPilWa1fQ/gCIc3yz2mhEzB+IKkJHosBGs9Ki4QckktkURPXr2wTC +tpQSCPfJsQKBgQCA2CNGhSa6fNj9P4B1AGBg3ozNCFCYDNjC5GdtB+P5zWVGfwNx +gul5qrp0tXBW9+JINInP5cvgnoSCRAsTVaA8lFv/KJ3rS0EGlILgTomkmReCfRVt +zc1hwsaBC8sHjc9a0VPeCvQE5y0XtQW9tTgpfB/QWGe+50Jg8sTDRvPEoQKBgQCk +Vql++6tW/DZ/nS4TXYIhethTAIqu+fey+6ToGSwtK4+9dDoPlksJp8AELBI9hvYT +WhrFxKoh92Mml8+hxJ0nRkLeHTyxk9BPs76Ev2wVCXSUPlWbYWJzWjY/A9sWLkPU +W0ToRCL+YalRJxFLg4BFDfGuAFY7ZCmmk26ZVz5NAQKBgQDak1xkSAgbV/eklbed +/BBwn3VOTE1dF5VHdByw6hjWj5XYQdOyV+4Z730kq4/6IB++D4fjpHoshn9KQglU +k9HyQCMgK19D3E6myR4QrihTP2KSFd+9iZvjdsnkIe8w1G2M3pa0HEdhvgNuEtBE +GuJz6eYUx58snpX/mO4yNPinlA== +-----END PRIVATE KEY----- diff --git a/conf/includes/json.conf b/conf/includes/json.conf index d801e61..9db138c 100644 --- a/conf/includes/json.conf +++ b/conf/includes/json.conf @@ -1,24 +1,47 @@ -# location ~ /admin(.*)/$ { location ~* .(3gp|apng|avi|avif|bmp|css|cur|flv|gif|htm|html|ico|jfif|jpeg|jpg|js|mid|mov|mp3|mp4|mpeg|mpg|ogg|pdf|php|pjp|pjpeg|png|svg|tif|tiff|txt|wav|webp|wmf|wml|wmv|xml|xml)$ { expires 1d; index index.html index.htm; - # mklink /J "D:\Tmp\Phares\www\pictures" "D:\Documents\Pictures" - # mklink /J "D:\Tmp\Phares\www\NGINdeX.io" "L:\GitHub\NGINdeX.io" root "D://Tmp//phares//www"; } location / { index index.html index.htm; - # mklink /J "D:\Tmp\Phares\www\pictures" "D:\Documents\Pictures" - # mklink /J "D:\Tmp\Phares\www\NGINdeX.io" "L:\GitHub\NGINdeX.io" + # root /var/www/html/637998119172547651; root "D://Tmp//phares//www"; # First attempt to serve request as file, then autoindex on; # Send the data in JSON autoindex_format json; - addition_types application/json; + # addition_types application/json; # Calling from SERVERNAME/autoindex/* - add_before_body /NGINdeX.io/header.html; - add_after_body /NGINdeX.io/footer.html; + # add_before_body /NGINdeX.io/header.html; + # add_after_body /NGINdeX.io/footer.html; # Need to tell that we are sending HTML - add_header Content-Type text/html; + # add_header Content-Type text/html; + if ($request_method = 'OPTIONS') { + add_header 'Access-Control-Allow-Origin' '*'; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; + # + # Custom headers and headers various browsers *should* be OK with but aren't + # + add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; + # + # Tell client that this pre-flight info is valid for 20 days + # + add_header 'Access-Control-Max-Age' 1728000; + add_header 'Content-Type' 'text/plain; charset=utf-8'; + add_header 'Content-Length' 0; + return 204; + } + if ($request_method = 'POST') { + add_header 'Access-Control-Allow-Origin' '*' always; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always; + add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range' always; + add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always; + } + if ($request_method = 'GET') { + add_header 'Access-Control-Allow-Origin' '*' always; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always; + add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range' always; + add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always; + } } \ No newline at end of file diff --git a/conf/includes/wwwroot.conf b/conf/includes/wwwroot.conf new file mode 100644 index 0000000..159b1f3 --- /dev/null +++ b/conf/includes/wwwroot.conf @@ -0,0 +1,4 @@ +location / { + root "D://wwwroot"; + try_files $uri $uri/ /index.html =404; +} \ No newline at end of file diff --git a/conf/nginx.conf b/conf/nginx.conf index 257981d..8a343d2 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -8,16 +8,20 @@ http { sendfile on; keepalive_timeout 65; server { - listen 5050; + # listen 80; + listen 443 ssl http2; + listen [::]:443 ssl http2; server_name localhost; - include "includes/html.conf"; + # https://localhost + ssl_certificate "includes/iscn5cg3256cps.infineon.com.crt"; + ssl_certificate_key "includes/iscn5cg3256cps.infineon.com.key"; + # ssl_password_file "includes/iscn5cg3256cps.infineon.com.pass"; + ssl_protocols TLSv1.2 TLSv1.1 TLSv1; + # include "includes/html.conf"; + include "includes/BaGet.conf"; error_page 500 502 503 504 /50x.html; include "includes/html-error.conf"; - } - server { - listen 4430; - server_name iscn5cg1325c0x.infineon.com; - include "includes/BaGet.conf"; + # include "includes/github.conf"; } server { listen 5051; @@ -27,7 +31,7 @@ http { server { listen 5052; server_name localhost; - include "includes/json.conf"; + include "includes/dex.conf"; } server { listen 5053; @@ -35,26 +39,13 @@ http { include "includes/ProgramData.conf"; } server { - listen 8080; - server_name ~(oi-metrology-viewer-archive).mes.infineon.com; - location / { - include "includes/Archive.conf"; - } + listen 5054; + server_name localhost; + include "includes/json.conf"; } server { - listen 8080; - server_name ~(oi-metrology-viewer-prod).mes.infineon.com; - location / { - include "includes/Viewer.conf"; - } + listen 5055; + server_name localhost; + include "includes/wwwroot.conf"; } - server { - listen 8088; - server_name *.mes.infineon.com; - include "includes/EAF-Viewer.Server.conf"; - } -} -# mklink /J "C:\Users\phares\AppData\Local\IFXApps\nginx-1.20.1\conf" "L:\Git\NGINX-Conf\conf" -# cd "C:\Users\ECMESEAF\AppData\Local\IFXApps\nginx-1.20.1" -# .\nginx -t -# .\nginx -s reload +} \ No newline at end of file