diff --git a/kg_gpti_transit_jwt.properties b/kg_gpti_transit_jwt.properties index 248390b..8ba9c0d 100644 --- a/kg_gpti_transit_jwt.properties +++ b/kg_gpti_transit_jwt.properties @@ -14,8 +14,8 @@ spring.datasource.hikari.minimum-idle=5 spring.datasource.hikari.max-lifetime=1700000 spring.datasource.hikari.idle-timeout=600000 spring.datasource.hikari.connection-timeout=30000 -spring.datasource.hikari.connection-test-query=SELECT now() -spring.datasource.hikari.validation-timeout=60000 +spring.datasource.hikari.connection-test-query=SELECT 1 +spring.datasource.hikari.validation-timeout=5000 private.key=MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQD1GHVopvcvpJyU/ha7+R9IDC6EoZyZKZ14XBGu95ikEUSPkIoxE8n6TbF8Srj95OxrowHhOejtMrUhF+NBJNR59evR9ZT1JO2yo/QvvfA834wiDpNzCDFQbGO5emuN9KoinZIpFSyMtjGNlaj7zf01wYIglSqr3kzpTYlF3zlVlW/6oGECA3swKnz9eiNEMg7WEHCIZx+HureHySSJi4MZLizH4EzAW8geUB7Vi5rJLfg5fPcXkJfOcP6PoSnfHqXkSw2DFEoM+hz3vrS/rj05YlkmTTKarnr+GOAc4IhE36zbSx93BaZ4d59Hsk5CuS4qk/sI9dn7IQYJKuypKJiFAgMBAAECggEBAI2AwoBaLUofYpuOmveJm+rPxaejWrL+2MBdf4QhxMmsgoXUcERnZWwSoQ7eYTGMkoaORQ6QjY8sgHCLxxOcPOPw/GZqv8ZMvMMvb1KE+YdblR8whSabq0UAXw79w8zgXb3AdVsss1zF75QLvNUsFy2K/CLtnAZAQO1Na5yghQyIKjKd8YXSP8Ylk15Nz942jbo71h980Uk3mr8tV/PqJ1x7cs1Z5femhQHNFDsuJMRh6TpPDSqEir3ziZs9jVQMR4pAMm5bCvfcsnOPaltomRymUKOTdvHBVv1LCTWNipQgqNPMitmcWtJnC48j62M5ADtnF1p30VezMQnylLS+3kECgYEA+rXZQdbndKHaROTE1bDAmthxgrOBW5wrzZ7B9Z0zDnrsuOa8bk8Dc0WNGd8/mzKz1t4fAfA7W9c/748erhwUFhBlzpv8COOcEJwWSL4dV0mCLBqMuhmb4yJRYwv2kVEdFvbWPjKRhr7WcnIV7rrbc/jr3kdr/aKSXzxt7J0BaDUCgYEA+kRIb8/0XC6YJL84v8NlkpgaGx7BDGqIsjVYrWAfTWtS01HxT+39QG6T5tT6rgkIN1FBxkvSvvuz2/mwSpAvVktCuZyIHoAutJUuowwwT9yYy0zaLyrhX44zoXZiHmZAHObxo1oYogtH64yhiC3X+uLtScW0g5Z7SFxjDOTFmRECgYEAxVNnwjhhSB0z7FGa0w4hKj79aH/carxKhbZUtvqZeuYpd4az/KZX8txlKF3cdEy923pMMXxhW/HZMrYU0bjr3kndt3ZyMpTi+ve/WlW4RkFnIUtsQ/VwCp+yKyD5WnrbSH3TNnUasVF2+/DrblDH9UmQbA0O5DyWtDqd0kPpHZkCgYEAs95rqWDuoWojkxWUNc67q9aBvMgnu0K+KEbLCyCwnrXp+1NDekzz3WEcD6U23epD624NNfW86+J/bDRSjeR/AShqNnjYJAPAja1CrZDPEDbd4g/EKG5LOKA9X2h0MKEQpzUcqmjQl3ZAJH0Yg4VfW0PJg2IC0ShQRruPvO6XTeECgYA54eQya6sEIpE7aIKXwitRMV3VE8jMP5cQHTLK841pFPKiC2iMQDrgJqjYuMJUdhx2WRhoHQwy76XvLMWzLmD+k2U4DwzSq3APc6r+m4EesUdhsmt8/DFyR29OT0r7OuVVppQbQ+SPHrtNxVrAVuwhpnfW8rTdZRdbPHAnwgs/lg== public.key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9Rh1aKb3L6SclP4Wu/kfSAwuhKGcmSmdeFwRrveYpBFEj5CKMRPJ+k2xfEq4/eTsa6MB4Tno7TK1IRfjQSTUefXr0fWU9STtsqP0L73wPN+MIg6TcwgxUGxjuXprjfSqIp2SKRUsjLYxjZWo+839NcGCIJUqq95M6U2JRd85VZVv+qBhAgN7MCp8/XojRDIO1hBwiGcfh7q3h8kkiYuDGS4sx+BMwFvIHlAe1YuayS34OXz3F5CXznD+j6Ep3x6l5EsNgxRKDPoc9760v649OWJZJk0ymq56/hjgHOCIRN+s20sfdwWmeHefR7JOQrkuKpP7CPXZ+yEGCSrsqSiYhQIDAQAB diff --git a/kz_istransit_jwt.properties b/kz_istransit_jwt.properties index 8e1b996..34ccd43 100644 --- a/kz_istransit_jwt.properties +++ b/kz_istransit_jwt.properties @@ -3,7 +3,8 @@ server.port=8082 issuer.name=istransit -logging.level.com.zaxxer.hikari=DEBUG +#logging.level.com.zaxxer.hikari=DEBUG +#logging.level.org.springframework=warn spring.datasource.url=jdbc:postgresql://10.101.1.6:5432/transit_2024_09_03?ApplicationName=kz_istransit_jwt spring.datasource.username=postgres @@ -12,19 +13,18 @@ spring.datasource.driver-class-name=org.postgresql.Driver spring.datasource.hikari.maximum-pool-size=10 spring.datasource.hikari.minimum-idle=5 -spring.datasource.hikari.max-lifetime=1700000 -spring.datasource.hikari.idle-timeout=600000 +spring.datasource.hikari.max-lifetime=600000 +spring.datasource.hikari.idle-timeout=300000 spring.datasource.hikari.connection-timeout=30000 -spring.datasource.hikari.connection-test-query=SELECT now() -spring.datasource.hikari.validation-timeout=60000 - +spring.datasource.hikari.connection-test-query=SELECT 1 +spring.datasource.hikari.validation-timeout=5000 +spring.datasource.hikari.validation-interval=60000 private.key=MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCsrV60WgOCbFDz7mrr5Ade4wSrKjgB4PX+Y2zzttc87FKILzZswpQv2XLRZXEbkgpAViV99BsKDSd0f46FTynTH3SqbAJ4KfhsVPqfMD2yNjJBJSRyLZ19QAFdyyveRI/b4oQ+dOl0ZhlAUQ5Hfg5G34cE/AyfoVaHRol2ZOpkf5XL90/dPKxPsAaWw+LwgD2PdqzINl1L17EspVUjNiRsclQqkodhzhP/brRhq5S03KKNtPnDhlZJsep67NX8cZQJgil8BnIzGHMqdFF+NBZoLPy/+r4U/Vr6O1oPZ7RK3ontY6fJPHY/bI17KxwQusk8C3tPJNwg2U3mhkJ3mF93AgMBAAECggEAE9nCX11RtfaZv9ESvZdzOXdDnCG4Wo7v+JSZe9LzH2/TdRBoY0xjGLUYu/W7cP3y6757hOVBDoDAnmXjjnOxTTH6iXTtO78nbdy/CvnSvd/5GwAYFoAj8Lgg8BVhL6YWG6MIrN1n0RfDo18uEw3suj0MGoiXMuqrNdXoC5JCV9cajVSDhABw761sNrwBgYCOxk28KrfTRLh6QsQGSf8stLDDwgfImWXJTLzKacFAemNRFuBqp+pQdVuBtorN9rYoGyiswVBTWIA06uUYZqK1uIRLh7wHf2cFARm5rREDwYmG8EHe8JXYeOU2JUF/Rd0V4EQVZHFB4VLwYYumwq2XUQKBgQDcyrmpaA7xjt7ilIV50CtzrY8hAJST2bbdnl/aMm7JI/ZjNFVXbTDHxUen0IvyHmpPS1Z3K8XJ2IR07L7vO3E96OJcYsU2dJ9/HZ5Vg+Q+f3TrscbNRc6Dn6knG9Vr/D/x3pJoyRR7VoWQXs6y87Df5eVtdjmzTTKtY/tmMhEyrQKBgQDINnvwg9vxhhaqflQmNCxGoAkImrYsyGBVlhOy3qbqnMVSQGW8ub/MChpNPrOBTNq6Nb7kK4dzYGSa7lK3vjX+9bc/8vUY69DpV9yZpp370UXTnrKkPUIgrVHiQfjfOXDXeHcpCNQD7E+cDM+DtPtgjtPV966HipFMSvOBmohDMwKBgQDY3Ro9ZeL/qpgLr1vnCOwVBA1ImhxVmIt/5FY7qDuevv778+Q7Khm2rnQyRamfl/ZNii8UgF8WYd/AROVJb3ZMG9lyauVQFn6uyXXCgviF1oUOGCCvcPhl2kW4DyOynCJmvHnMCG1gs9wesLCPnsJFOLb/rBcCoTm8iy7b8yNnRQKBgCeDSTaQb2ndMr/3KphXl51gnCfMkMOJ0ClT8xNMCdknk3HGL83tQsL8A3DXPQn5pvk0/jV9ub+1eGVzP3Pv4CwvRjkis+h1Mce7hVf1oBxAku1O1qa/SDu2uQBUUM+NQI3lwm6gxWb4zkVX6eRuZWYLCheiSBmL6V0LNb+QRfAtAoGBAJ4tM34ovk0Ag/fRjxgEYqo7FcMplBs3nymGV/zS9QQA4gorGq5mBiQX0n8wR68UpKz7u1NXNXc7hJGvP0uHK+/GCQd9i1Csow641TIdMv+4XhQl2/ZO0NuJb/NVB6qJ93WlnhWJP3s1a1zVlRyF3+Zn0D8nbBp+tkCbET0+XGuB public.key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArK1etFoDgmxQ8+5q6+QHXuMEqyo4AeD1/mNs87bXPOxSiC82bMKUL9ly0WVxG5IKQFYlffQbCg0ndH+OhU8p0x90qmwCeCn4bFT6nzA9sjYyQSUkci2dfUABXcsr3kSP2+KEPnTpdGYZQFEOR34ORt+HBPwMn6FWh0aJdmTqZH+Vy/dP3TysT7AGlsPi8IA9j3asyDZdS9exLKVVIzYkbHJUKpKHYc4T/260YauUtNyijbT5w4ZWSbHqeuzV/HGUCYIpfAZyMxhzKnRRfjQWaCz8v/q+FP1a+jtaD2e0St6J7WOnyTx2P2yNeyscELrJPAt7TyTcINlN5oZCd5hfdwIDAQAB access.time=600 refresh.time=43200 - captcha.key=PPExpv36jk4Vzda3NpYnXLfuHCLYXqaNrxlOH/Jr/1M= captcha.time=600 diff --git a/org_ccalm_jwt.properties b/org_ccalm_jwt.properties index 52e962c..87460cf 100644 --- a/org_ccalm_jwt.properties +++ b/org_ccalm_jwt.properties @@ -2,7 +2,7 @@ spring.application.name=org_ccalm_jwt server.port=8082 issuer.name=ccalm -logging.level.com.zaxxer.hikari=DEBUG +#logging.level.com.zaxxer.hikari=DEBUG spring.datasource.url=jdbc:postgresql://91.201.214.156:5432/CCALM?ApplicationName=org_ccalm_jwt spring.datasource.username=postgres @@ -14,9 +14,10 @@ spring.datasource.hikari.minimum-idle=5 spring.datasource.hikari.max-lifetime=1700000 spring.datasource.hikari.idle-timeout=600000 spring.datasource.hikari.connection-timeout=30000 -spring.datasource.hikari.connection-test-query=SELECT now() -spring.datasource.hikari.validation-timeout=60000 +spring.datasource.hikari.connection-test-query=SELECT 1 +spring.datasource.hikari.validation-timeout=5000 +personal_data.key=8YxGFFOd private.key=MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDNgtaCfu5QlhWfU8bJAooLoX+bo/ARsvoWUJf5NodkGOivze5Lqtu5eq6ptT+gVKK+IEsjpmDsFPMCE2CW7xLZfgbtrWmTPd+fiRb2Z/fMudedo166H5WEgS3+TDWKt7WkLA/3kqvIqdBotuL4BENwZj6CIjGNdG01RNsCaDA/vxTkzx9njz6kfgAda/+wbdOJNwjNRgIb9AyedQT5OKvqRXequzrrOKD9wrm1O4nv8lA6WFg5YEMSW7T6WRIeArZsQr1aHv6qkiu47YreApfdFIWHxd9QinA9WrLPYdWXONr7+xyvqS4MHSJh9ZmCvMsc/HcF3RHJgEwgiC8E6hiZAgMBAAECggEAByZOICwaTmNqTSi0+blE5DKyJdAGQhdf6/bR0rG69BiJv9QCPk+rZUCHYxATLpjDMKoe8xaOuKfh7GiQK7AVj8t6ojouOhkk9n/mdJwZWt38Slesq/z9TqbP2tD769+ISjXeOFa58zk1Lu9t5gL/9aEY+54E607pnbjPhb3qL819/7absLbY1y3GKw2Cwd7RfP8nOWj0ViwnalFjfg6YZS1BL5c9NSg41FzZolwPruZ/bBGbc3nMW2khpuK7CtRk1pRJHUNYuVCsaBU4M4sf3tlZQPOdB6eYmQ3xmPtdnHYB13s588KialXKFlAuO4zG0CFa8DfIKsWDv6xTC1cMgQKBgQD6CjJuu715oKob7ohDTfrSppk4PY/kxWhUkKyKVW1Y1jXQOcd4BwVSyH6s7N8pCSWMwWmoF/t/l2kIcAWNZnsbzAQ8TYOhp1THstXMVb6c7JOL3SQC5RjbgW1RWCalh7/4QVE0xYeEL3qv5I2t9215zKR87Z6LIdJkxxAsHgMSbQKBgQDSaOp0kJZPkQH/75ltaI9exczyoaf+5U/OrnqT2lpRwa+5wqUTPWpTFTCDcJdu8OKCgrKPOQ6NACuX4PbIW/jR+70w7nbC46Tx3JdDYxBlm+6MuHUs5RXufFDJyGoN8lJzoPGax3uxY1kxWwSaSIB0sVXV/P3PIE31I5DbarWjXQKBgQCrRyLm4anYUCtWuN4UpK0lcUPR17Hi9ysRioz2sbAWw53XRk0SNlT6MSc9E4GGnaJgOflDUTJRY4lqYzoac1HvZ6CbIkoCCRq1NRbpQu8wlYo4q8JITWDqtE0LBMRsbYId77hN2uWKse9r37cBrVULsxgWD7uj+QYjTI0Se3iFPQJ/SSYwXFXn68F98Hxb2q1/KnOZzMBmpzcRh8kg1EYVIFc1wF7rBMVVMY0sUIXUH72fAcBuU1yCsoJcpXCQWxeeaWIbY+eDYj3CGlOWQtct3CVZyZJXKkR6W27cp0oFlNOp1okddbHkTsc7Ou1prDmIbwk3zi0mD9wrPg4fTijK/QKBgQDrYEWT77dQLPcN3RTVn3Ua2d9aj/IWwC330I4qZq2SFKOaB/olnPA6fLNYToTWO70A2ZlsMtVepdThIeYFidkA7Lj7lTVYFdQQzREsO5908A1YWE4sgMEEdMc7n5xKT85vpkPOjBOLZYQ6JjDeWBMDxnXR9/txwbau4bsq3/QFuQ== public.key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzYLWgn7uUJYVn1PGyQKKC6F/m6PwEbL6FlCX+TaHZBjor83uS6rbuXquqbU/oFSiviBLI6Zg7BTzAhNglu8S2X4G7a1pkz3fn4kW9mf3zLnXnaNeuh+VhIEt/kw1ire1pCwP95KryKnQaLbi+ARDcGY+giIxjXRtNUTbAmgwP78U5M8fZ48+pH4AHWv/sG3TiTcIzUYCG/QMnnUE+Tir6kV3qrs66zig/cK5tTuJ7/JQOlhYOWBDElu0+lkSHgK2bEK9Wh7+qpIruO2K3gKX3RSFh8XfUIpwPVqyz2HVlzja+/scr6kuDB0iYfWZgrzLHPx3Bd0RyYBMIIgvBOoYmQIDAQAB access.time=600 @@ -36,3 +37,5 @@ url.main=https://ccalm.org/ spring.redis.host=127.0.0.1 spring.redis.port=6379 spring.redis.password=9F3/NKWeOjd815vkadT2DcgVHf6fEpVQXw== + + diff --git a/org_ccalm_jwt.yml b/org_ccalm_jwt.yml new file mode 100644 index 0000000..3e2037a --- /dev/null +++ b/org_ccalm_jwt.yml @@ -0,0 +1,51 @@ +server: + port: 8082 +issuer: + name: ccalm + +spring: + application: + name: org_ccalm_jwt + datasource: + url: jdbc:postgresql://91.201.214.156:5432/CCALM?ApplicationName=org_ccalm_jwt + username: postgres + password: PasSecrKey1 + driver-class-name: org.postgresql.Driver + hikari: + maximum-pool-size: 10 + minimum-idle: 5 + max-lifetime: 1700000 + idle-timeout: 600000 + connection-timeout: 30000 + connection-test-query: SELECT 1 + validation-timeout: 5000 + redis: + host: 127.0.0.1 + port: 6379 + password: 9F3/NKWeOjd815vkadT2DcgVHf6fEpVQXw== + +mail: + host: smtp.yandex.ru + port: 465 + login: info@ccalm.org + password: fu2lpsoGPGiq1xlRm8ag + +captcha: + key: PPExpv36jk4Vzda3NpYnXLfuHCLYXqaNrxlOH/Jr/1M= + time: 600 + +url: + reset: https://ccalm.org/api/authorization/v02/reset + main: https://ccalm.org/ + +personal_data: + key: 8YxGFFOd + +private: + key: MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDNgtaCfu5QlhWfU8bJAooLoX+bo/ARsvoWUJf5NodkGOivze5Lqtu5eq6ptT+gVKK+IEsjpmDsFPMCE2CW7xLZfgbtrWmTPd+fiRb2Z/fMudedo166H5WEgS3+TDWKt7WkLA/3kqvIqdBotuL4BENwZj6CIjGNdG01RNsCaDA/vxTkzx9njz6kfgAda/+wbdOJNwjNRgIb9AyedQT5OKvqRXequzrrOKD9wrm1O4nv8lA6WFg5YEMSW7T6WRIeArZsQr1aHv6qkiu47YreApfdFIWHxd9QinA9WrLPYdWXONr7+xyvqS4MHSJh9ZmCvMsc/HcF3RHJgEwgiC8E6hiZAgMBAAECggEAByZOICwaTmNqTSi0+blE5DKyJdAGQhdf6/bR0rG69BiJv9QCPk+rZUCHYxATLpjDMKoe8xaOuKfh7GiQK7AVj8t6ojouOhkk9n/mdJwZWt38Slesq/z9TqbP2tD769+ISjXeOFa58zk1Lu9t5gL/9aEY+54E607pnbjPhb3qL819/7absLbY1y3GKw2Cwd7RfP8nOWj0ViwnalFjfg6YZS1BL5c9NSg41FzZolwPruZ/bBGbc3nMW2khpuK7CtRk1pRJHUNYuVCsaBU4M4sf3tlZQPOdB6eYmQ3xmPtdnHYB13s588KialXKFlAuO4zG0CFa8DfIKsWDv6xTC1cMgQKBgQD6CjJuu715oKob7ohDTfrSppk4PY/kxWhUkKyKVW1Y1jXQOcd4BwVSyH6s7N8pCSWMwWmoF/t/l2kIcAWNZnsbzAQ8TYOhp1THstXMVb6c7JOL3SQC5RjbgW1RWCalh7/4QVE0xYeEL3qv5I2t9215zKR87Z6LIdJkxxAsHgMSbQKBgQDSaOp0kJZPkQH/75ltaI9exczyoaf+5U/OrnqT2lpRwa+5wqUTPWpTFTCDcJdu8OKCgrKPOQ6NACuX4PbIW/jR+70w7nbC46Tx3JdDYxBlm+6MuHUs5RXufFDJyGoN8lJzoPGax3uxY1kxWwSaSIB0sVXV/P3PIE31I5DbarWjXQKBgQCrRyLm4anYUCtWuN4UpK0lcUPR17Hi9ysRioz2sbAWw53XRk0SNlT6MSc9E4GGnaJgOflDUTJRY4lqYzoac1HvZ6CbIkoCCRq1NRbpQu8wlYo4q8JITWDqtE0LBMRsbYId77hN2uWKse9r37cBrVULsxgWD7uj+QYjTI0Se3iFPQJ/SSYwXFXn68F98Hxb2q1/KnOZzMBmpzcRh8kg1EYVIFc1wF7rBMVVMY0sUIXUH72fAcBuU1yCsoJcpXCQWxeeaWIbY+eDYj3CGlOWQtct3CVZyZJXKkR6W27cp0oFlNOp1okddbHkTsc7Ou1prDmIbwk3zi0mD9wrPg4fTijK/QKBgQDrYEWT77dQLPcN3RTVn3Ua2d9aj/IWwC330I4qZq2SFKOaB/olnPA6fLNYToTWO70A2ZlsMtVepdThIeYFidkA7Lj7lTVYFdQQzREsO5908A1YWE4sgMEEdMc7n5xKT85vpkPOjBOLZYQ6JjDeWBMDxnXR9/txwbau4bsq3/QFuQ== +public: + key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzYLWgn7uUJYVn1PGyQKKC6F/m6PwEbL6FlCX+TaHZBjor83uS6rbuXquqbU/oFSiviBLI6Zg7BTzAhNglu8S2X4G7a1pkz3fn4kW9mf3zLnXnaNeuh+VhIEt/kw1ire1pCwP95KryKnQaLbi+ARDcGY+giIxjXRtNUTbAmgwP78U5M8fZ48+pH4AHWv/sG3TiTcIzUYCG/QMnnUE+Tir6kV3qrs66zig/cK5tTuJ7/JQOlhYOWBDElu0+lkSHgK2bEK9Wh7+qpIruO2K3gKX3RSFh8XfUIpwPVqyz2HVlzja+/scr6kuDB0iYfWZgrzLHPx3Bd0RyYBMIIgvBOoYmQIDAQAB +access: + time: 600 +refresh: + time: 43200 diff --git a/src/main/java/org/ccalm/jwt/MainController.java b/src/main/java/org/ccalm/jwt/MainController.java index fb9d72d..35352e0 100644 --- a/src/main/java/org/ccalm/jwt/MainController.java +++ b/src/main/java/org/ccalm/jwt/MainController.java @@ -318,7 +318,7 @@ public class MainController implements ServletContextAware { if(jwt_a.equals("") || countOccurrences(jwt_a, '.')!=2) { - throw new CustomException(10000, trt.trt("Please_send_a_valid_JWT_token"),null); + throw new CustomException(10000, trt.trt("Please_log_in"),null); } //Проверяю подпись токена Jws claims = null; @@ -375,7 +375,7 @@ public class MainController implements ServletContextAware { if(jwt_a.equals("") || countOccurrences(jwt_a, '.')!=2) { - throw new CustomException(10000, trt.trt("Please_send_a_valid_JWT_token"),null); + throw new CustomException(10000, trt.trt("Please_log_in"),null); } //Проверяю подпись токена Jws claims = null; @@ -441,7 +441,7 @@ public class MainController implements ServletContextAware { try { if(jwt_a.equals("") || countOccurrences(jwt_a, '.')!=2) { - result=createStrJSONError(10000,trt.trt("Please_send_a_valid_JWT_token"), (String)null, (String)null); + result=createStrJSONError(10000,trt.trt("Please_log_in"), (String)null, (String)null); return result; } @@ -691,7 +691,7 @@ public class MainController implements ServletContextAware { if(jwt_a.equals("") || countOccurrences(jwt_a, '.')!=2) { - throw new CustomException(10000, trt.trt("Please_send_a_valid_JWT_token"),null); + throw new CustomException(10000, trt.trt("Please_log_in"),null); } //Проверяю подпись токена Jws claims = null; @@ -1253,7 +1253,7 @@ public class MainController implements ServletContextAware { if(jwt_a.equals("") || countOccurrences(jwt_a, '.')!=2 || jwt_r.equals("") || countOccurrences(jwt_r, '.')!=2 ) { logout(response,request); - throw new CustomException(10000, trt.trt("Please_send_a_valid_JWT_token"),null); + throw new CustomException(10000, trt.trt("Please_log_in"),null); } //Разбираю токен без проверки, чтобы выбрать email @@ -1600,7 +1600,7 @@ public class MainController implements ServletContextAware { if(jwt_a.equals("") || countOccurrences(jwt_a, '.')!=2) { - return createStrJSONError(10000,trt.trt("Please_send_a_valid_JWT_token"),(String)null,(String)null); + return createStrJSONError(10000,trt.trt("Please_log_in"),(String)null,(String)null); } //Connection conn = getConnection(); //Checking the token signature diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 99d4074..600f29d 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -25,9 +25,11 @@ - + + + diff --git a/update_password.py b/update_password.py new file mode 100644 index 0000000..f0ceb1d --- /dev/null +++ b/update_password.py @@ -0,0 +1,110 @@ +import psycopg2 +import re +import yaml + +def generate_password(length=8): + # Определяем возможные символы для разных категорий + lower_case = string.ascii_lowercase + upper_case = string.ascii_uppercase + digits = string.digits + special_characters = string.punctuation + + # Гарантируем, что в пароле будет хотя бы один символ каждого типа + password = [ + secrets.choice(lower_case), # строчная буква + secrets.choice(upper_case), # заглавная буква + secrets.choice(digits), # цифра + secrets.choice(special_characters) # спецсимвол + ] + + # Заполняем оставшиеся символы случайными из всех категорий + all_characters = lower_case + upper_case + digits + special_characters + password += [secrets.choice(all_characters) for _ in range(length - 4)] + + # Перемешиваем полученные символы + secrets.SystemRandom().shuffle(password) + + # Собираем строку из символов и возвращаем + return ''.join(password) + +# Функция для чтения конфигурации из YAML файла +def get_configurations(properties_file): + with open(properties_file, 'r') as file: + config = yaml.safe_load(file) # Чтение YAML файла + + # Извлекаем данные из конфигурации + db_url = config.get('spring', {}).get('datasource', {}).get('url', '') + db_user = config.get('spring', {}).get('datasource', {}).get('username', '') + current_password = config.get('spring', {}).get('datasource', {}).get('password', '') + + # Разбираем URL для получения host, port, и dbname + match = re.match(r'jdbc:postgresql://([^:]+):(\d+)/([^?]+)', db_url) + if match: + db_host = match.group(1) + db_port = match.group(2) + db_name = match.group(3) + else: + raise ValueError("Database URL is invalid in the properties file.") + + return db_host, db_port, db_name, db_user, current_password + +# Функция для обновления пароля в файле конфигурации +def update_password_in_file(properties_file, current_password, new_password): + with open(properties_file, 'r') as file: + content = file.read() + + # Заменяем старый пароль на новый + updated_content = re.sub(rf'spring.datasource.password={current_password}', f'spring.datasource.password={new_password}', content) + + with open(properties_file, 'w') as file: + file.write(updated_content) + +# Основная функция для смены пароля в PostgreSQL +def change_postgresql_password(db_host, db_port, db_name, db_user, current_password, new_password): + try: + # Подключаемся к PostgreSQL с использованием старого пароля + conn = psycopg2.connect( + dbname=db_name, + user=db_user, + password=current_password, + host=db_host, + port=db_port + ) + conn.autocommit = True + + # Создаем курсор для выполнения SQL-запроса + cursor = conn.cursor() + + # Запрос для изменения пароля пользователя + cursor.execute(f"ALTER USER {db_user} WITH PASSWORD '{new_password}';") + + cursor.close() + conn.close() + + print(f"Password for user {db_user} successfully changed.") + except Exception as e: + print(f"Error changing password in PostgreSQL: {e}") + return False + return True + +# Главная логика скрипта +def main(): + # Путь к файлу конфигурации Spring Boot + properties_file = "application.yml" + + # Получаем данные из файла конфигурации + db_host, db_port, db_name, db_user, current_password = get_configurations(properties_file) + + # Новый пароль + new_password = generate_password() # Укажите новый пароль здесь + + # Меняем пароль в PostgreSQL + if change_postgresql_password(db_host, db_port, db_name, db_user, current_password, new_password): + # Обновляем пароль в файле конфигурации + update_password_in_file(properties_file, current_password, new_password) + print(f"Password updated successfully in {properties_file}.") + else: + print("Password change failed.") + +if __name__ == "__main__": + main()