diff --git a/certs/test/nesica1.crt b/certs/test/nesica1.crt new file mode 100644 index 0000000..2a2bb9d --- /dev/null +++ b/certs/test/nesica1.crt @@ -0,0 +1,27 @@ +Bag Attributes + localKeyID: 31 77 24 59 11 3A 84 C4 65 93 75 DE B7 EE 5A 89 6A B3 41 DA +subject=C = JP, ST = A, L = A, CN = nesica1 +issuer=C = JP, ST = A, L = A, CN = nesys +-----BEGIN CERTIFICATE----- +MIIDxTCCAq2gAwIBAgIUfH7CYtnS909tjCJmn3h+9oqsLzUwDQYJKoZIhvcNAQEL +BQAwNTELMAkGA1UEBhMCSlAxCjAIBgNVBAgMAUExCjAIBgNVBAcMAUExDjAMBgNV +BAMMBW5lc3lzMB4XDTIzMDYwNTAwMDc1OVoXDTMzMDYwMjAwMDc1OVowNzELMAkG +A1UEBhMCSlAxCjAIBgNVBAgMAUExCjAIBgNVBAcMAUExEDAOBgNVBAMMB25lc2lj +YTEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCX+/yIAFz9TpeyQxw +b3YYL+9Ngfedmxil7U3HZcpDR+2ysNtmdMTIVzQhz+ql7y3BJ+CSriEvDotuhRp1 +5RFANcqf5JoolZ9m3a6BZZkQrjBZqCD7UOTExf11WKLq05N0Nr0EKoGRn4PQF04m +W/3zjpx3M53EbOAVq5bstGyClrTWItvHpzuJ3doCLotTUOKW+b6B5WPnjkPBuR9B +kMa9Ru1ZlQqxkEVxAqLdNSOLVisTASZ91ZmLhQM7klOSfMbO/6tWV2ZKgQ02Cdjt +7tEYKakGfmT21YT3q2f/2FF9TyarX9nma4RLnoNwt+GlH8bZFukr/Nkk2sf1jRZk +YecdAgMBAAGjgcowgccwHQYDVR0OBBYEFCMsf1N9KUmlPlwvFw4CBIXAuxo1MB8G +A1UdIwQYMBaAFNIBY5H/aDapjbeUecKlfXXV6ouRMA8GA1UdEwEB/wQFMAMBAf8w +dAYDVR0RBG0wa4INY2VydC5uZXN5cy5qcIIOY2VydDMubmVzeXMuanCCDWRhdGEu +bmVzeXMuanCCDnByb3h5Lm5lc3lzLmpwghFuZXN5cy50YWl0by5jby5qcIIYZmpt +MTcwOTIwemVyby5uZXNpY2EubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQAXSf9Tk/i2 +/Sq2mE5TiFSbhnLQB8GAn1UbiVZb6MSlrNDDuvVCk7MkYT2OnLamlbE1sdblU7/J +TIESBo4hjlwBaN61KpGRnf4NVrBh7gyCmcOHmlSAxL0+Irc0ZzwFk6Dz47MSGwYJ +QCeGWvryQdTxKpqzf04u5kOzWezoyTzxnxqw4VyxNZRXaYGfdLnzzm31jLl0Wd8d +oVyCwDmDN2lb71S5XJ47ugR+bRD3YDm0ZS+42qLvvA8FaIV/lOV1xK6So29yEz0P +HvLi/sJs0Mck7ZlG56MzwSCYHNcFTBGVVIZM2tcxWsXS/+VxtHJtbysY64eHnYog +G/7ah4CXcWtI +-----END CERTIFICATE----- diff --git a/certs/test/nesica1.key b/certs/test/nesica1.key new file mode 100644 index 0000000..962bbc0 --- /dev/null +++ b/certs/test/nesica1.key @@ -0,0 +1,31 @@ +Bag Attributes + localKeyID: 31 77 24 59 11 3A 84 C4 65 93 75 DE B7 EE 5A 89 6A B3 41 DA +Key Attributes: +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDCX+/yIAFz9Tpe +yQxwb3YYL+9Ngfedmxil7U3HZcpDR+2ysNtmdMTIVzQhz+ql7y3BJ+CSriEvDotu +hRp15RFANcqf5JoolZ9m3a6BZZkQrjBZqCD7UOTExf11WKLq05N0Nr0EKoGRn4PQ +F04mW/3zjpx3M53EbOAVq5bstGyClrTWItvHpzuJ3doCLotTUOKW+b6B5WPnjkPB +uR9BkMa9Ru1ZlQqxkEVxAqLdNSOLVisTASZ91ZmLhQM7klOSfMbO/6tWV2ZKgQ02 +Cdjt7tEYKakGfmT21YT3q2f/2FF9TyarX9nma4RLnoNwt+GlH8bZFukr/Nkk2sf1 +jRZkYecdAgMBAAECggEAFW7Tu/yYfGtVgN8lbn5z5K3gcsj6f1f7S0yT74FDYNDd +Hn+O6cjFbBvlhTbydlKd1ncptbLauOAfMtQde1ODZ/OmgKQJ9aCt/39BP0ZvLt4u +Oaym2l9sol/8l0RrTn5++2kPxZZUTDTtKXRwax1orsMScLhx1Jd2zBzsGvS4JFv9 +anPRESNQK1c8I1ZBZH4372KjkKH4lsKURrX/Uf4Vxz7jz60zw0NEVNefewfmmz1f +fEd7F1He3Hb82r/n7diieUmrDiQnE4GwV8lsrtu8lss++89G2RtVOMlJ51uD+qOm +ToOCsRylFO8cLQ+0BsLHNKQsRXz7AtYMk+jn/W/L4QKBgQD2nfmu9P6ghaeP70YJ +HdFiUDDNzxDAs81Uj5Pty66pR05NIf1BSXwqZh8dmXI3kYOZohwaFMQOBWUwlXvi +vbpblnh8hiMvXxTgb1xPx+kEGSnkCLbiEjOEgMc7/s2iKXX/qH0Nw2NPTf44bKsr +juxxNthzSqGKulO8uyrrJ97NTQKBgQDJxSCH2XbpLThYQlQfRn+J/z29IKpC2u/R +e0nf9xmU0HDtfqxM0UXEtSBDZ2K4SRrT1w/mWmdkObw7O7JXMSnrevsL5A1qkFpO +6LrNtDRVZk4DjNo1z+KNc88WUZVu79IazTAWfWzX0dn/Khm+oB4ds0UkJhKUFhJf +xY1EZNDZEQKBgCSICjBsgjttEQE1RH6dOCMEFfamsaiZ+dSI4DTdcyYINgUe/9Dn +/ciaEAnmbRDmMURUyyzh3pjlG7QysINJ740ZoQdxJ00hHIqSdG4tAstkntv0noKm +h5MdMGYmvHdFBQG2B7A+PTvGJd5d2o09QrESmsWZTIysRTMz1ou3AD4RAoGBAJQH +7m/82kMFDDuknjc778J84vzpBEF8g0o7m92XWstViiSUNTE+sGM7R+pr5X+zEt2t +AVtNpGFiAnmquJND3K+JULpOnJE8SyVtle/pcCPfpQjxw/6LAHorJxoGzQ3RIWLM +e6VkbACDU97jMnQq4S2FIwr8a9D9yIk/VP+Cv78hAoGBAOGJ1LJhj9pMZeY4kmAA +L4qujX55bzs9Lk/+zKwE5RlwDpFzXzSXXHnWZeEyOb6ENyOnUpwT5gRyJFKidD1h +gtEx0PWclBbrf84Tz1GRurVmb+FuRe5la+aLb5Otdudnc+mggNGFoAOZMU8mQtoQ +s/bVTFKdN0+vYR18OTu3nGQg +-----END PRIVATE KEY----- diff --git a/certs/test/nesica1.pfx b/certs/test/nesica1.pfx new file mode 100644 index 0000000..7f1294b Binary files /dev/null and b/certs/test/nesica1.pfx differ diff --git a/certs/test/nesys.crt b/certs/test/nesys.crt new file mode 100644 index 0000000..7496bb1 --- /dev/null +++ b/certs/test/nesys.crt @@ -0,0 +1,25 @@ +Bag Attributes + localKeyID: 95 50 8D 60 5A CE 2B CF 64 99 FD DC 17 8C 56 AC 12 73 70 FF +subject=C = JP, ST = A, L = A, CN = nesys +issuer=C = JP, ST = A, L = A, CN = Taito Arcade Machine CA +-----BEGIN CERTIFICATE----- +MIIDXTCCAkWgAwIBAgIUZvUOPy2SRMCgA7kLN+3K5pj6PUswDQYJKoZIhvcNAQEL +BQAwRzELMAkGA1UEBhMCSlAxCjAIBgNVBAgMAUExCjAIBgNVBAcMAUExIDAeBgNV +BAMMF1RhaXRvIEFyY2FkZSBNYWNoaW5lIENBMB4XDTIzMDYwNTAwMDc1OFoXDTMz +MDYwMjAwMDc1OFowNTELMAkGA1UEBhMCSlAxCjAIBgNVBAgMAUExCjAIBgNVBAcM +AUExDjAMBgNVBAMMBW5lc3lzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC +AQEAyPW5EMLI0fxhkgW5NgL37C/pqG1Dq5lUR/vZeqAzOyi6WkZfq4CYIdQapnrB +J/Q0agnBWHZc9xORoLI0bGCwL3ipTc5rimO6626OCytGuyTJO5vAmDDbENNKavAl +y4mzVNCDHdY3Pt9GuF7yM8IhluOWWEbqTy/m+X4WI6NupXQWTw6Z+SAYywBzbOfq +qwiexb7R7DDTkP903tNLa+TNNA9N13Fjg0jqS9c+L0EcNVh2WwtkGIcDFfI656sI +Mu16mUmnZrOonAjryDDrjmMIYjAlhpI4XElonZxuoq0IRQVMrWOBJVkt7LMz2X/w +5NNm+1Pfxz6MXLv5dQ23Uo8jpQIDAQABo1MwUTAdBgNVHQ4EFgQU0gFjkf9oNqmN +t5R5wqV9ddXqi5EwHwYDVR0jBBgwFoAUdlf7M4BI/ELlCwTbk84NocX26+cwDwYD +VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAnkR/ZX3zDQaOZRCxaBJ8 +dMdAWVW7gKfUUUFn9icRAs8g2NnxhLAQ1Wj9Xet80OflqusUIz1kfbrdHDn2kQrV +2dwYTOaLou7xGK3VWZDdfsQ5jDd2bdW2EPU1UsN9/4okUBu19aUEoezgbL3tZbDr +XdIDu/e3XVRgCA2dMXaoh2ue/kJ6OcN58Jkf5pmgCCAvCFogvGZsK7VP+fGNovas +5Z5z/gZFb5QcHFM5r4U9k+XpHp8a3uhnXJk8KCiPY977TxLmlEARDmvvTMLmPhxX +rfDJOZglAMaR94wS5zyyWMxNNZImgsrwf6Jm+7iI3bJNPQxJOxB+9gRDSw/TYRr/ +sA== +-----END CERTIFICATE----- diff --git a/certs/test/nesys.key b/certs/test/nesys.key new file mode 100644 index 0000000..d228448 --- /dev/null +++ b/certs/test/nesys.key @@ -0,0 +1,31 @@ +Bag Attributes + localKeyID: 95 50 8D 60 5A CE 2B CF 64 99 FD DC 17 8C 56 AC 12 73 70 FF +Key Attributes: +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDI9bkQwsjR/GGS +Bbk2AvfsL+mobUOrmVRH+9l6oDM7KLpaRl+rgJgh1BqmesEn9DRqCcFYdlz3E5Gg +sjRsYLAveKlNzmuKY7rrbo4LK0a7JMk7m8CYMNsQ00pq8CXLibNU0IMd1jc+30a4 +XvIzwiGW45ZYRupPL+b5fhYjo26ldBZPDpn5IBjLAHNs5+qrCJ7FvtHsMNOQ/3Te +00tr5M00D03XcWODSOpL1z4vQRw1WHZbC2QYhwMV8jrnqwgy7XqZSadms6icCOvI +MOuOYwhiMCWGkjhcSWidnG6irQhFBUytY4ElWS3sszPZf/Dk02b7U9/HPoxcu/l1 +DbdSjyOlAgMBAAECggEAA1FvV1QBndn72gqtjRmnP03OBVs2GVPxFmkvPsn8+CnL +F4KyJ+V59y3TeZ+gQQkhGzkcnKadQ763RYuu6uhjyfAR/fgxDvo1LWSVBG3+Za7Z +tcBaGzxlrMiLiFCwk95EfEHr6ebnrZ2UXNn24ZzmEhUHt/hslcpVykiaYMdDiruX +worBxz6P0ajk9lxWhj1yuauLqoJtV9AYdplDk9NJa2BA74YMpkH2Gim1iDNDKfTw +Tq075hBAGeVMY2y8dYvX84wLvp9b/rUZOyM4TCvZgRsiNY6qXuIczHmh9IyASBlc +TI9oxfEpJa0h+ySa/Cnb3+OwRqdYjugbGhRiGloegQKBgQDwCZ60u3KstNw3eIcC +1D/G1ZbzegzPtfJCzDIM+JQ5pIHBLiqi+OfPkOzKCD1oFxSeXg+p/2giPBiGfUyD +cWBiB3r3mGvB+khpXJG02dM8JuQ5egSZHOguIaKRzQVDN49TjED9SNSAleXbFPo0 +kOag3tAgd4LA+iE1JL5f54dRQQKBgQDWUtjWE3ZtPZlz8HmVif+GUJFZnlW7K3R3 +lJlM9ISWz4ebzrrk5pgwZRVAbzgXGPcPLZEDS7BtyuwpWZ0e4+C5/QBGdywZVpHA +s9xKIWBAZsU8NBdZwNzF8wmutNo5cszqaNDRL7DTLsEgNTUOZ1xz789vvZhB/hFc +Y4wTLlHVZQKBgQCAyQiHe1LJargEYvw8/lfBfHNi6obZIot6X0gzQWN1kde0J+rk +SZtF+EGzG7ymjkuXtGu/D7N1Or0F21Aj7b6CmfTVxsd56ajULsBWQdBdo5grZlX1 +OFcx+QXaKB+8sqCJeOSdgGfTHZmXc6fScDPs996+rKBQnWMXukER/4zQgQKBgDsI +7vlouwI0KYSqBJOQQ3Y30xGgb3Ty703Q/LkZ0TvJRk1AkHJkoh8SeNwaxpR2J/di +UcNaoepcLtjk+kZ79nbEncLLKLaCBfvSjydMMjsLE+EVaCks2qMb4trgrguM96zJ +2lsEi+xfwIqinU6uYeT9dWIOE1Z6KUYNlZPi+l+RAoGBAL+0ATjUn3qV4Buo8frN +RuXqwIpYBPOHLVQHoEhDLdOiTvM0vElFnLq0Hq7wmuVSiiVbKSlsEZbQHRZlaChp +32YDqVxUYGEj5XnpBiCq3DTLru7Wr8r0njvKiBMNLOPPbtHukHnJFZL3gDTo96Ey +js/euYOMeKilOMkIURCKhw4P +-----END PRIVATE KEY----- diff --git a/certs/test/nesys.pfx b/certs/test/nesys.pfx new file mode 100644 index 0000000..affeea6 Binary files /dev/null and b/certs/test/nesys.pfx differ diff --git a/certs/test/root.crt b/certs/test/root.crt new file mode 100644 index 0000000..069619e --- /dev/null +++ b/certs/test/root.crt @@ -0,0 +1,25 @@ +Bag Attributes + localKeyID: 96 20 7D 93 C7 3E C0 5A 55 61 3E 4E 0C 2D E7 44 35 87 5B 03 +subject=C = JP, ST = A, L = A, CN = Taito Arcade Machine CA +issuer=C = JP, ST = A, L = A, CN = Taito Arcade Machine CA +-----BEGIN CERTIFICATE----- +MIIDbzCCAlegAwIBAgIUacZ68WtsoozH9w1+jlpguBVIh5gwDQYJKoZIhvcNAQEL +BQAwRzELMAkGA1UEBhMCSlAxCjAIBgNVBAgMAUExCjAIBgNVBAcMAUExIDAeBgNV +BAMMF1RhaXRvIEFyY2FkZSBNYWNoaW5lIENBMB4XDTIzMDYwNTAwMDc1OFoXDTMz +MDYwMjAwMDc1OFowRzELMAkGA1UEBhMCSlAxCjAIBgNVBAgMAUExCjAIBgNVBAcM +AUExIDAeBgNVBAMMF1RhaXRvIEFyY2FkZSBNYWNoaW5lIENBMIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoUvkzIO4WLknQUWA2z7/ZqrnwjRxKow27PHm +e6K6jTDcgEzKVljXCJV6TNWdlhU/jWoxqYmrQZJA8YGrUW3x9yUZB8WSusNfIU4m +5sLtTDTW7ivJbbOpSDernFBmemVnn9KGWuggp6LlH8Q+RzYEPWRszKNxC2lYNDKw +nLVRUIr8bKqVvzRDf+qk4lAV7WAJQW4SYzluOvf9ftSP54MwCexRIImnL9D/3OBi +4qxJrravaJdBWphd2r9WLUgOwTLN2f6p9NpTIbG+oOHsy/myW1cQw3i9mQM9jdK1 +rSzlgbqP5EmK6EN5aMhEy531d7zZBE1WDEx58dqArchVTmjo1QIDAQABo1MwUTAd +BgNVHQ4EFgQUdlf7M4BI/ELlCwTbk84NocX26+cwHwYDVR0jBBgwFoAUdlf7M4BI +/ELlCwTbk84NocX26+cwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC +AQEANnk5Tdl3+LM5KZEHub6zig/i5U+Hl9cCbkqPyX5yZNsKuUYg/Sc+5+neuhfx +agvoIFMwbpv5OmyNFuTKtzaBx/VWymANYM9+vaV1so8XqtCeHYKu2Skq3oV58LSX +h1tZPwtnGoVJgeG5d5fltWgb26K7e1W0VZlgZPKiwWM/nMRPQW1tfB6l6Yd6bCL8 +My4PKHDPIva86YHM1CDJAnAv52ZSG46aOulUT0RUNJXDrF2+mEgjJ7vxQSRyvUTt +UWF2S+v9CemYfR+ghvtr3hAo9rNtlkBvW+tvCA3lPbc1U8DJwAOGQ0a/keaEegk+ +9dmTRoOYNN6kJBpgg+WCjswWbA== +-----END CERTIFICATE----- diff --git a/certs/test/root.key b/certs/test/root.key new file mode 100644 index 0000000..5fd2a5f --- /dev/null +++ b/certs/test/root.key @@ -0,0 +1,31 @@ +Bag Attributes + localKeyID: 96 20 7D 93 C7 3E C0 5A 55 61 3E 4E 0C 2D E7 44 35 87 5B 03 +Key Attributes: +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQChS+TMg7hYuSdB +RYDbPv9mqufCNHEqjDbs8eZ7orqNMNyATMpWWNcIlXpM1Z2WFT+NajGpiatBkkDx +gatRbfH3JRkHxZK6w18hTibmwu1MNNbuK8lts6lIN6ucUGZ6ZWef0oZa6CCnouUf +xD5HNgQ9ZGzMo3ELaVg0MrCctVFQivxsqpW/NEN/6qTiUBXtYAlBbhJjOW469/1+ +1I/ngzAJ7FEgiacv0P/c4GLirEmutq9ol0FamF3av1YtSA7BMs3Z/qn02lMhsb6g +4ezL+bJbVxDDeL2ZAz2N0rWtLOWBuo/kSYroQ3loyETLnfV3vNkETVYMTHnx2oCt +yFVOaOjVAgMBAAECggEABjDnDdCKfWFR9+fmi8PNws+RiLtBkrwCCbM5QQqcdXno +JMaNx6WuT0aJhLR4UX/sSg3G7TZ7C8/EzWBIRp5dOLrETK+RM7j3CEy7IoVd3Vxz +2X11xE+ukjaM0DmnzU/iG9jVTlz1j+mpOMBsEYipvf+CS5KEbscy2wINFF7DSb+U +Q8oMGDne7AoXyh3SvPCuPJK4gZq5usjG7XL8nYACaVmCotbrjmG633yBArMjQMet +Wtjq5jpVvGHa5AvOlxeh1eaQnDQVzvirURIZo9K/rmgKDMV7muUiq0K8KKmTld80 +/6CelYikwg7jI0IRy6AP2kL0/e3KfBrL5HEx4ErzgQKBgQDh+57z1St4rAW4RW2H +IWxofPeNrgBC8cFUm8GrIFw5T6xh/q0DLxU1IczUxWAOP0NnQG7qdMW84RGM3aSw +kh9msi8wiYaHMecvFflz3vsTWEhjY/ocdhIcWfFCpreRo/+fpAUJzpEU4VTiW/Wh +6+E30Mmb/FcW1zWlPk/X+h9MlQKBgQC2uKi5jDTx6olMdTwHD5Xhd3qhx9/VMDqB +YKpezOO0FUpD3spVM/H1P4qTB44U345WtRR4KVKbaCPPh3A3EF6rIkYv0BwTrZe/ +p6qTSq8woKzUrNX1uA9ZPLGGOBj/dDeEV4KC0Jp/hzt+TlujUDxdCLBtskBZS0LN +khAx3mfbQQKBgQCgQ6Cw8EcKJ4VO7/4DTZLib23pDrOkxmsDpAqvYB3Hj1eDj+gH +UAbMTZJEe03qDLeyrCF9KR9rGnsl2bKIfrjCTi/lTkMX8i4wWHc207ZgO8Xqpuaj +9KBXdvoA+NdK9HG/N8VS9SozErLubaVAFlb9DJdOhqEE0895xz08wGgeGQKBgAX/ +Q5JrdqVmBEGdK24z5cBzsnOy4rbVkWYDrTPVV7fmZvyZSFzJiqx4/Gxc+B3ZRIu1 +/8j92jc9kMdT86vq/qBxTIpvMyy2Kt/geenBrsRS0bldPtyEwQQ1yMHV/4QK5XOT +h7YRcLC02JAJtFpE3OZUza2cBx6nKLckjyGD4jbBAoGBANQDkmYFJ4m54rxdaRms +vjORG6ncxxucQbX+A5vgFUUXzRhB0qQre0pmLBJb2TZWyldN5botq9LEWVLS4NLg +y3l0SY1Sl7Ax0ZH+uZVb9E/BSIytkcp6AbcGgIRvAISHO7bGiUORO8BBFkHmxuYG +xbK01G+eU/ZsrBbpjeDrehHY +-----END PRIVATE KEY----- diff --git a/certs/test/root.pfx b/certs/test/root.pfx new file mode 100644 index 0000000..73ed66d Binary files /dev/null and b/certs/test/root.pfx differ diff --git a/src/main.rs b/src/main.rs index 02f2927..f753a62 100755 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,3 @@ -//! Restart PC and see if installed certs work -//! get rid of HTTP cert issue in access logs #![allow(unused_variables)] #![allow(non_snake_case)] #![allow(dead_code)] @@ -26,6 +24,7 @@ use md5::{Digest, Md5}; #[post("/basicinfo")] async fn basicinfo() -> HttpResponse { + println!("/basicinfo\nNot fully implemented!"); /* let pem = "-----BEGIN PUBLIC KEY----- MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy63nybDg2d0l5Em5RTsx @@ -62,49 +61,51 @@ async fn basicinfo() -> HttpResponse { #[macro_export] macro_rules! resp { ($str:expr) => { - HttpResponse::Ok().append_header(ContentType(mime::TEXT_PLAIN)).body($str) - //HttpResponse::Ok().append_header(ContentType::octet_stream()).body($str) + //HttpResponse::Ok().append_header(ContentType(mime::TEXT_HTML)).body($str) + HttpResponse::Ok().append_header(ContentType::octet_stream()).body($str) }; } #[get("/alive/{id}/Alive.txt")] async fn alive(id: web::Path, req: actix_web::HttpRequest) -> HttpResponse { - println!("---"); - println!("Method: {:?}", req.method()); - println!("Host: {:?}", req.head().uri.host()); - println!("Path: {:?}", req.path()); - println!("/alive/{}/Alive.txt", id); resp!("") } #[get("/alive/i.php")] async fn alive_i() -> HttpResponse { + println!("/alive/i.php"); resp!("REMOTE ADDRESS:10.3.0.53\nSERVER NAME:LLSIFAC\nSERVER ADDR:10.3.0.53") } #[post("/service/card/incomALL.php")] async fn incomALL() -> HttpResponse { + println!("/service/card/incomALL.php"); resp!("1+1") } #[post("/service/respone/respone.php")] async fn respone() -> HttpResponse { + println!("____________________________"); + println!("/service/respone/respone.php"); resp!("1") } #[get("/server/FireAlert.php")] async fn fire_alert() -> HttpResponse { + println!("/server/FireAlert.php"); resp!("OK") } #[get("/server/cursel.php")] async fn cursel() -> HttpResponse { + println!("/server/cursel.php"); resp!("1\n") } #[get("/server/gameinfo.php")] async fn gameinfo() -> HttpResponse { + println!("/server/gameinfo.php"); resp!("0\n3\n301000,test1\n302000,test2\n303000,test3\n") } #[post("/game/info")] @@ -121,6 +122,7 @@ async fn game_info() -> HttpResponse { Aes128CfbEnc::new(key.into(), iv.into()).encrypt(&mut ciphertext); //println!("{:?}", String::from_utf8_lossy(&ciphertext)); + println!("/game/info"); HttpResponse::Ok().append_header(ContentType::octet_stream()).body(ciphertext) } @@ -135,16 +137,16 @@ pub struct Certify { #[get("/server/certify.php")] async fn certify(data: web::Query, req: HttpRequest) -> HttpResponse { - println!("Certify!"); + println!("/server/certify.php"); dbg!(&data); let mut hasher = Md5::new(); let gid_bytes = "303801".as_bytes(); // LL game nesys id hasher.update(gid_bytes); let hash_result = hasher.finalize(); + let mut ticket = String::new(); for byte in hash_result { - print!("{:x?}", &byte); + ticket.push_str(&format!("{:x?}", &byte)); } - println!(""); let res = format!( "host=http://10.3.0.53 no=1337 @@ -156,6 +158,7 @@ x-img=http://10.3.0.53/test.png x-ranking=http://10.3.0.53/ranking/ranking.php ticket=9251859b560b33b031516d05c2ef3c28" ); + println!("Response:\n{}", &res); resp!(res) } @@ -178,8 +181,8 @@ fn load_rustls_config() -> rustls::ServerConfig { let config = ServerConfig::builder().with_safe_defaults().with_no_client_auth(); // load TLS key/cert files - let cert_file = &mut BufReader::new(File::open("./certs/nesica1.crt").expect("Certificate not found!")); - let key_file = &mut BufReader::new(File::open("./certs/nesica1.key").expect("Key not found!")); + let cert_file = &mut BufReader::new(File::open("./certs/test/nesica1.crt").expect("Certificate not found!")); + let key_file = &mut BufReader::new(File::open("./certs/test/nesica1.key").expect("Key not found!")); // convert files to key/cert objects let cert_chain = certs(cert_file).unwrap().into_iter().map(Certificate).collect(); @@ -196,7 +199,7 @@ fn load_rustls_config() -> rustls::ServerConfig { #[actix_web::main] async fn main() -> std::io::Result<()> { - env_logger::init_from_env(env_logger::Env::new().default_filter_or("info")); + //env_logger::init_from_env(env_logger::Env::new().default_filter_or("info")); let config = load_rustls_config(); info!("Certificates loaded."); println!("Started!");