| + |
+
+ | |||||
| + |
+
| + | ||||
+
+ | ||||||
|
+
+ | ||||||
|
+
+ | ||||||
| + |
+
| + | ||||
|
+
+ | ||||||
|
+
+ | ||||||
|
+
+ | ||||||
| + |
+
| + | ||||
|
+
+ | ||||||
|
+
+ | ||||||
|
+
+ | ||||||
| + |
+
| + | ||||
|
+
+ | ||||||
|
+
+ | ||||||
|
+
+ | ||||||
| + |
+
| + | ||||
|
+
+ | ||||||
|
+
+ | ||||||
|
+
+ | ||||||
| + |
+
| + | ||||
|
+
+ | ||||||
|
+
+ | ||||||
|
+
+ | ||||||
| + |
+
| + | ||||
|
+
+ | ||||||
|
+
+ | ||||||
|
+
+ | ||||||
| + |
+
| + | ||||
|
+
+ | ||||||
|
+
+ | ||||||
|
+
+ | ||||||
| + | ||||||
| + | ||||||
| + + | + + | ||
|
+
+ | |||
+ +This posting is no longer available. + + \ No newline at end of file diff --git a/zefie_wtvp_minisrv/ServiceDeps/wtv-news/localserver_ca.pem b/zefie_wtvp_minisrv/ServiceDeps/wtv-news/localserver_ca.pem new file mode 100644 index 00000000..6a5fbe67 --- /dev/null +++ b/zefie_wtvp_minisrv/ServiceDeps/wtv-news/localserver_ca.pem @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIID1TCCAr2gAwIBAgIUQzfMpYgezM0u/aOpBIYzCTSNuSgwDQYJKoZIhvcNAQEL +BQAwejELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk5ZMRcwFQYDVQQKDA5aZWZpZSBO +ZXR3b3JrczEQMA4GA1UECwwHbWluaXNydjETMBEGA1UEAwwKbWluaXNydl9jYTEe +MBwGCSqGSIb3DQEJARYPemVmaWVAemVmaWUubmV0MB4XDTIyMTAxMjAzMzQzOVoX +DTIyMTExMTAzMzQzOVowejELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk5ZMRcwFQYD +VQQKDA5aZWZpZSBOZXR3b3JrczEQMA4GA1UECwwHbWluaXNydjETMBEGA1UEAwwK +bWluaXNydl9jYTEeMBwGCSqGSIb3DQEJARYPemVmaWVAemVmaWUubmV0MIIBIjAN +BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzo8+u/9kJcQY+mOKLxYNOtNSWqlu +fwSKpo/kCMbCkM4TCJiaKHWwtXeT5tgrYPqg6s3nHpG2arwI/sxX6fy86s9i8bu5 +NEaO6/Czii0gQLXznURPaCPKp2dJEpcrFvqsB/Ej7Bm2cZH4BaOW9CeaMdrSXK1e +Tlwem1XHPeFnIPGQr3sYp2CNcB3TWzNkGGDPB2CBcR+qB2Fnjb7aEcd5t4imJqT6 +BPTiDB234v3glcEaDBIr3bT/YGZuRn7Ou8qAVKlfT4iDsgHkpW+V7RYRocfAynPF +mSxQf2i4hIfvK2mGhdpcQGH5WTOp6K9xIv/lGIZcb29xoAeICplq3/u24wIDAQAB +o1MwUTAdBgNVHQ4EFgQUG8IOPoOiwIA1GI/3pANtftkD7BwwHwYDVR0jBBgwFoAU +G8IOPoOiwIA1GI/3pANtftkD7BwwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0B +AQsFAAOCAQEAaG63vM/KbOfx/wzg8dZE6j/h8Ai0wJ1iXXvBLa23+fpZwfHIMH/A +uvkap+OzX3oI8fdalReY11+WONfzA4pyuNPtluwkngSLjT8YSfHfM3MUM6LKt5x4 +rRNBNN74H8A7q5UDA/SD2M1HjcOkFNlH4XrE6Uy/ColCVV9cYGPdx1rKwiQiKK7Q +Nr+6awAYHzQ2kdrZ4kneBZqAWAuIzjjWMxcgVwCHpb4rV0u3j/uhIos/8Q6NtLA7 +EqW0qMWmpJ9DlqfhLXqVCgfPyxGNpvTom0lw6J8OL8U6d+oaeVTZW44/3A8wNjJ+ +Gd2qQMxupodfV3LVyREvDpM+cowW6q+qHA== +-----END CERTIFICATE----- diff --git a/zefie_wtvp_minisrv/ServiceDeps/wtv-news/localserver_cert.pem b/zefie_wtvp_minisrv/ServiceDeps/wtv-news/localserver_cert.pem new file mode 100644 index 00000000..83c6dd06 --- /dev/null +++ b/zefie_wtvp_minisrv/ServiceDeps/wtv-news/localserver_cert.pem @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDnDCCAoSgAwIBAgIULCdoiUdXwTXF3qsxau5hOdxSiKQwDQYJKoZIhvcNAQEL +BQAwejELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk5ZMRcwFQYDVQQKDA5aZWZpZSBO +ZXR3b3JrczEQMA4GA1UECwwHbWluaXNydjETMBEGA1UEAwwKbWluaXNydl9jYTEe +MBwGCSqGSIb3DQEJARYPemVmaWVAemVmaWUubmV0MCAXDTIyMTAxMzAwNTIwMFoY +DzIxMjIwOTE5MDA1MjAwWjB/MQswCQYDVQQGEwJVUzERMA8GA1UECAwITmV3IFlv +cmsxFzAVBgNVBAoMDlplZmllIE5ldHdvcmtzMRAwDgYDVQQLDAdtaW5pc3J2MRIw +EAYDVQQDDAlsb2NhbGhvc3QxHjAcBgkqhkiG9w0BCQEWD3plZmllQHplZmllLm5l +dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN5R/V1oF69ZvKyz0toA +1f2+b1BUkYivtiVYlSavAqS2EiqhKCNZdreFIuIMHo8v0npir3VxXxwwVBM2+DPQ +sp08wUCu9nLidYYBMl4qlRRANmd5i6uQ0ErLceSPv/KfkDeVfd63rrKvQCxBqhFi +OI/ZI+bxkK+P7fAntKJ35abKDQyJ4NblAb+AUXvxo+HsCaX8Gyox8cbLFGrkNICY +Pe9YcuY899OhuY/vBLTkkLXKyynG7nLaGYc39uNGg/SI0ZWcAEC1q0uRVB5ed3X7 +BfpIlP60wxLi8eX7DANDyoRJ/vOSF5RIilmrPM6bXnAMYRmsUb+Z3Wjc8NRBZCC/ +5a0CAwEAAaMTMBEwDwYDVR0RBAgwBocEfwAAATANBgkqhkiG9w0BAQsFAAOCAQEA +nFPOU9HRjf/i5r8qS8VodNbZRVD0+aemdJobdvmlBbNn+Uh2k4sYcBse9dI2ZGbB +5Z0sxAAJXdynVqzrhIQzZUDsZFi1mBI8rpo6hGdL7QU2aepiDDb4dBpt3Xc8XcmT +SeXV5sPTZC4wT8t/IJh6wAynPKmBl1BveTtml4BHiNS2YKYK3LrTkpxRhoAiBatf +km4+UiL/6nskBhLuKkLLYTgA1VwrbnzSMjGWkJ8F9E9xsXrcK29eyCYhKJXETO5T +Npdk7Hl8qbbe8/a99XRxZzi/rcf5VjnQ3CmxE/+jV99efhrCyc1l0EwS04qfjUhA +mRVCPS3bpgPbKkCHe7TGXw== +-----END CERTIFICATE----- diff --git a/zefie_wtvp_minisrv/ServiceDeps/wtv-news/localserver_key.pem b/zefie_wtvp_minisrv/ServiceDeps/wtv-news/localserver_key.pem new file mode 100644 index 00000000..f16d54f5 --- /dev/null +++ b/zefie_wtvp_minisrv/ServiceDeps/wtv-news/localserver_key.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpAIBAAKCAQEA3lH9XWgXr1m8rLPS2gDV/b5vUFSRiK+2JViVJq8CpLYSKqEo +I1l2t4Ui4gwejy/SemKvdXFfHDBUEzb4M9CynTzBQK72cuJ1hgEyXiqVFEA2Z3mL +q5DQSstx5I+/8p+QN5V93reusq9ALEGqEWI4j9kj5vGQr4/t8Ce0onflpsoNDIng +1uUBv4BRe/Gj4ewJpfwbKjHxxssUauQ0gJg971hy5jz306G5j+8EtOSQtcrLKcbu +ctoZhzf240aD9IjRlZwAQLWrS5FUHl53dfsF+kiU/rTDEuLx5fsMA0PKhEn+85IX +lEiKWas8zptecAxhGaxRv5ndaNzw1EFkIL/lrQIDAQABAoIBAH8A+aulrnom2okS +hW6ysYyugKq0VRtvva9iBnq92dW8iW4++E4Raqd2cDIQWFjWKfhubeu6o2nYFf+Q +FISNQaxfq8rG6NVCl37BKkPvMZELCclc/zQ4mzVPObYnhLEXBG0sgmZ8Klm7kf52 +WLBrmwJaOo9RCqWwpG3gUOnLcq8vhvqKEXRzqaHqPtWJEuU09FgXt55/8eydykvE +JqP9W1iLpwYgknSkC65QKxpWrKx1h9JbkKUzOx4H51WzR2qVDT3VVK+5J7LvonSI +p1eEDGH8g3kWp6T0qwaUTkVINS4hhg/l5XPEqKkTNayKIJeSrEkfgs0sL/D9cxTI +gswml6ECgYEA/E7RJa8xXDqthtw/Uxss5wfANquufBxl9c0Spp2M1SfMSXGTQ+SQ +6mUGsWdiFhv98vPVv4JDfjvOSonppG9+cd2+kSignCeEt33hMb6cgp9QpG0PC22C +B2JqWtN4YuS8D+Hms5ZwC1XSavXCD8gPspXlo6jM6Q/3fPZxZr+xvzkCgYEA4ZLV +rOwODiPRB3DL+Y01KJZQvHGbU9QRAjAfqpdJ6UagueKQB6I/GxCKwtZbG1l2RreM +vjhvDf8oWW4Oe+Ff9PXp/A4C42RbPKTKIUNLiDd+qVsn9yT2dypibb3W6pzLQru7 +gT72ERCwb/yAoIbwLSUpudarRxASOBiCxgJO5hUCgYAdQE4DHnKMjMj9b59v1SC5 +kC56qCDMhsZTXvkgk/d15u1KPn6iSmd6pUfHXYMDqS8h8Z8AWuvUQL7D6YVK6Rox +vVGQprMoJ3S9iTyIdd7TTgEdbv9lhcajcIeADDBS1s3u0XPbsj8/MS359JARIFKh +k7tR5AoNoypANJolHWhQEQKBgQC8iPV+6m109AqppWVW1ucvXTNtzaZ9kioFIiPV +eU2VZCrCMtMfDkSgYlsYLgFIAqYQxSkldBWeJT2cQZhpgh2pqEBBI5TWafK35SPs +WUqwN3HuKvpkXsiBITPTdXBD93kL9czqYa1Y5hISB4Gaqi3kDcOqR/owEwanTBVB +WnyHYQKBgQChNn7uvIIUzQKoxYyvXk5NVIb1xey64deOVnayg66s6oHF9UHtynay +equq5maSgyF3Ft597koiG7ylMkcXkdsmUPos26ZSDlgqYC9v+VopqQB3T06ltyGA +lOjjVjzofTSzMvQ1UFbDoogelpnZNn8koKrgrUuZL+A0VLEYQTFITg== +-----END RSA PRIVATE KEY----- diff --git a/zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/index.js b/zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/index.js index 5d5d2cc7..f31c7f7a 100644 --- a/zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/index.js +++ b/zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/index.js @@ -49,8 +49,8 @@ function getPatchDataType(type, invert = false) { patch_data += "wtv-system-version: %s\r\n"; patch_data += "wtv-capability-flags: %s\r\n"; patch_data += "wtv-client-bootrom-version: %s\r\n"; - patch_data += "wtv-need-upgrade: %s\n"; - patch_data += "wtv-used-8675309: %s\n"; + patch_data += "wtv-need-upgrade: %s\r\n"; + patch_data += "wtv-used-8675309: %s\r\n"; patch_data += "wtv-client-rom-type: %s\r\n"; patch_data += "wtv-system-chipversion: %s\r\n"; patch_data += "User-Agent: %s\r\n"; @@ -192,7 +192,6 @@ function getPatchData(fname, client_data_obj, start_url = "client:GoToConn", def var customized_patch_data = patch_data[fname]; Object.keys(customized_patch_data).forEach(function (idx) { var val = customized_patch_data[idx]; - if (typeof val === 'string') { // start url override if (start_url != patch_defaults.start_url && start_url.length <= patch_limits.start_url) { @@ -209,7 +208,7 @@ function getPatchData(fname, client_data_obj, start_url = "client:GoToConn", def if (!val.byteLength) { // not a buffer object var block_length = val['length']; - var patch_data = getPatchDataType(val['type'], (fname.substr(12,3) != "1.1")); + var patch_data = getPatchDataType(val['type'], (fname.substr(12, 3) != "1.1")); if (patch_data) { var patch_data_array = patch_data.split("\r\n"); var patch_data_string = ""; @@ -365,6 +364,7 @@ if (request_headers.query.viewer && data: viewer_data, patch_data: getPatchData(viewer_file, client_data_obj) } + if (!patchDataObject.patch_data) { errpage = wtvshared.doErrorPage("500", null, socket.minisrv_pc_mode) headers = errpage[0]; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js b/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js index 54eca96a..78341d1f 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js @@ -40,13 +40,16 @@ if (socket.ssid) { data = errpage[1]; } -if (request_headers.query.relogin && session_data.getSessionData("registered")) gourl += "relogin=true"; +if (request_headers.query.relogin && session_data.getSessionData("registered")) { + gourl += "relogin=true"; + session_data.setUserLoggedIn(false); +} if (request_headers.query.reconnect && session_data.getSessionData("registered")) gourl += "reconnect=true"; if (session_data.data_store.wtvsec_login) { var prereg_contype = "text/html"; - if (request_headers.query.relogin) { // relogin + if (request_headers.query.relogin || request_headers.query.guest_login) { // relogin session_data.data_store.wtvsec_login.ticket_b64 = null; // clear old ticket } @@ -55,7 +58,7 @@ if (session_data.data_store.wtvsec_login) { var file_path = null; var bf0app_update = false; var romtype = session_data.get("wtv-client-rom-type"); - var send_tellyscript = (minisrv_config.services[service_name].send_tellyscripts && !request_headers.query.relogin); + var send_tellyscript = (minisrv_config.services[service_name].send_tellyscripts && !request_headers.query.relogin && !request_headers.query.guest_login); var wtv_script_id = parseInt(session_data.get("wtv-script-id")); var bootrom = session_data.get("wtv-client-bootrom-version"); if ((request_headers.query.reconnect || request_headers.query.relogin) && wtv_script_id != 0) send_tellyscript = false; @@ -68,7 +71,6 @@ if (session_data.data_store.wtvsec_login) { } else { romtype = session_data.get("wtv-client-rom-type"); } - var file_path = null; switch (romtype) { case "US-LC2-disk-0MB-8MB": case "US-LC2-disk-0MB-8MB-softmodem-CPU5230": @@ -77,9 +79,8 @@ if (session_data.data_store.wtvsec_login) { case "US-WEBSTAR-disk-0MB-16MB-softmodem-CPU5230": prereg_contype = "text/tellyscript"; // if wtv-open-access: true then client expects OpenISP - if (session_data.get("wtv-open-access")) file_path = __dirname + "/" + - + "/wtv-1800/tellyscripts/LC2/LC2_OpenISP_56k.tok"; - else var file_path = ServiceDeps + "/wtv-1800/tellyscripts/LC2/LC2_WTV_18006138199.tok"; + if (session_data.get("wtv-open-access")) file_path = ServiceDeps + "/wtv-1800/tellyscripts/LC2/LC2_OpenISP_56k.tok"; + else file_path = ServiceDeps + "/wtv-1800/tellyscripts/LC2/LC2_WTV_18006138199.tok"; break; case "US-DTV-disk-0MB-32MB-softmodem-CPU5230": @@ -164,7 +165,7 @@ if (session_data.data_store.wtvsec_login) { if (bf0app_update) headers += getServiceString('wtv-star', { "no_star_word": true }) + "\n"; else headers += getServiceString('wtv-star') + "\n"; - if (request_headers.query.reconnect && !session_data.getSessionData("registered") && !session_data.lockdown) headers += getServiceString('wtv-register') + "\n"; + if (request_headers.query.reconnect && !session_data.isRegistered() && !session_data.lockdown) headers += getServiceString('wtv-register') + "\n"; if (!session_data.lockdown) headers += getServiceString('wtv-flashrom') + "\n"; if (bf0app_update) headers += "wtv-boot-url: " + gourl + "\n"; else { diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/admin.js b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/admin.js index 19dfde37..8dcdabb0 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/admin.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/admin.js @@ -21,7 +21,7 @@ if (auth === true) {
@@ -57,19 +57,19 @@ if (auth === true) {
${minisrv_config.config.service_name} Admin Tricks
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/deleteaccount.js b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/deleteaccount.js index 2a8b5682..94177dfd 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/deleteaccount.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/deleteaccount.js @@ -39,7 +39,7 @@ wtv-noback-all: wtv-admin:/deleteaccount`;
${minisrv_config.config.service_name} Admin Tricks
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/deleteuser.js b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/deleteuser.js index 5d96215f..d10326ba 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/deleteuser.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/deleteuser.js @@ -48,7 +48,7 @@ wtv-noback-all: wtv-admin:/deleteuser`;
${minisrv_config.config.service_name} Admin Tricks
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/findaccount.js b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/findaccount.js index 96d63cac..6aed0b8b 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/findaccount.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/findaccount.js @@ -28,7 +28,7 @@ wtv-noback-all: wtv-admin:/findaccount`;
${minisrv_config.config.service_name} Admin Tricks
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/operatortweaks.js b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/operatortweaks.js new file mode 100644 index 00000000..3e9e8117 --- /dev/null +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/operatortweaks.js @@ -0,0 +1,273 @@ +var minisrv_service_file = true; + +var WTVAdmin = require(classPath + "/WTVAdmin.js"); +var wtva = new WTVAdmin(minisrv_config, session_data, service_name); +var auth = wtva.isAuthorized(); + +function generateFormField(type, confvar, options = null) { + if (confvar.indexOf('.') > 0) { + var confvar_split = confvar.split('.'); + console.log(confvar_split) + // not operater error resistant, be mindful if you modify this page + if (user_config.config[confvar_split[0]]) + var confvar_value = user_config.config[confvar_split[0]][confvar_split[1]] || minisrv_config.config[confvar_split[0]][confvar_split[1]] + else + var confvar_value = minisrv_config.config[confvar_split[0]][confvar_split[1]]; + + confvar = confvar.replace(".", "-"); + } else + var confvar_value = user_config.config[confvar] || minisrv_config.config[confvar]; + + if (type == "input") + return `` + if (type == "checkbox") + return `\n` + if (type == "select") { + var out = `"; + } +} + +if (auth === true) { + var password = null; + if (request_headers.Authorization) { + var authheader = request_headers.Authorization.split(' '); + if (authheader[0] == "Basic") { + password = Buffer.from(authheader[1], 'base64').toString(); + if (password) password = password.split(':')[1]; + } + } + if (wtva.checkPassword(password)) { + var user_config = wtvshared.getUserConfig(); + headers = "200 OK\r\nContent-Type: text/html"; + data = ` + +
++
+
${minisrv_config.config.service_name} Operator Tweaks
+ +These settings can be updated without restarting minisrv ++
| + | |||||||||||||||||||||||||
| + | |||||||||||||||||||||||||
+
| + | + + | |||||||||||||||||||||||
+ + | |||||||||||||||||||||||||
| + | + | + + | + | ||||||||||||||||||||||
| + | |||||||||||||||||||||||||
${minisrv_config.config.service_name} Admin Tricks
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/regenfavs.js b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/regenfavs.js index 50446a1b..ee7d4f47 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/regenfavs.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/regenfavs.js @@ -39,7 +39,7 @@ wtv-noback-all: wtv-admin:/regenfavs`;
${minisrv_config.config.service_name} Admin Tricks
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/reloadconfig.js b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/reloadconfig.js index f9b02c6f..163ac9ed 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/reloadconfig.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/reloadconfig.js @@ -25,7 +25,7 @@ wtv-noback-all: wtv-admin:/reloadconfig`;
${minisrv_config.config.service_name} Admin Tricks
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/removeuserpasswd.js b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/removeuserpasswd.js index 81db23e9..1dadeb37 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/removeuserpasswd.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/removeuserpasswd.js @@ -44,7 +44,7 @@ wtv-noback-all: wtv-admin:/removeuserpasswd`;
${minisrv_config.config.service_name} Admin Tricks
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/unban.js b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/unban.js index e9e7442b..2950864e 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/unban.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/unban.js @@ -56,7 +56,7 @@ wtv-expire-all: wtv-admin:/unban`;
${minisrv_config.config.service_name} Admin Tricks
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/validate-operator-tweaks.js b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/validate-operator-tweaks.js new file mode 100644 index 00000000..ec25ce06 --- /dev/null +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/validate-operator-tweaks.js @@ -0,0 +1,48 @@ +var minisrv_service_file = true; + +var WTVAdmin = require(classPath + "/WTVAdmin.js"); +var wtva = new WTVAdmin(minisrv_config, session_data, service_name); +var auth = wtva.isAuthorized(); + +if (auth === true) { + var password = null; + if (request_headers.Authorization) { + var authheader = request_headers.Authorization.split(' '); + if (authheader[0] == "Basic") { + password = Buffer.from(authheader[1], 'base64').toString(); + if (password) password = password.split(':')[1]; + } + } + if (wtva.checkPassword(password)) { + var user_config = wtvshared.getUserConfig(); + Object.keys(request_headers.query).forEach((k) => { + if (k === "autosubmit") return; + var v = request_headers.query[k]; + if (!isNaN(parseInt(v))) v = parseInt(v); + if (v === "on" || v === "true" || v === "false") v = wtvshared.parseBool(v); + if (k.indexOf("-") > 0) { + var s = k.split("-"); + if (!user_config.config[s[0]]) user_config.config[s[0]] = {} + user_config.config[s[0]][s[1]] = v; + } else { + user_config.config[k] = v; + } + }); + var res = wtvshared.writeToUserConfig(user_config); + if (res) { + console.log(" * Configuration updated from wtv-admin, reloading") + reloadConfig(); + headers = "200 OK\nwtv-expire-all: wtv-admin:/operatortweaks\nContent-Type: text/html"; + } else { + err = wtvshared.doErrorPage(400, "Error writing userconfig"); + headers = err[0]; + data = err[1]; + } + } +} + +if (!headers) { + err = wtvshared.doErrorPage(); + headers = err[0]; + data = err[1]; +} \ No newline at end of file diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/ValidateLogin.js b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/ValidateLogin.js index 7a321b17..323ad9f2 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/ValidateLogin.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/ValidateLogin.js @@ -9,13 +9,12 @@ if (request_headers.query.hangup) { Location: client:gototvhome wtv-visit: client:hangupphone` } else { - var user_id = (request_headers.query.user_id) ? request_headers.query.user_id : session_data.user_id; if (socket.ssid !== null && user_id !== null) session_data.switchUserID(user_id); if (socket.ssid !== null && !session_data.get("wtvsec_login")) { - wtvsec_login = new WTVSec(minisrv_config); + wtvsec_login = session_data.createWTVSecSession(); wtvsec_login.IssueChallenge(); wtvsec_login.set_incarnation(request_headers["wtv-incarnation"]); session_data.set("wtvsec_login", wtvsec_login); @@ -52,7 +51,7 @@ wtv-visit: client:hangupphone` if (request_headers.query.skip_splash) gourl += "&skip_splash=true"; } - if (user_id != null && !request_headers.query.initial_login && !request_headers.query.user_login) { + if (user_id != null && !request_headers.query.initial_login && !request_headers.query.user_login && !request_headers.query.relogin) { if (request_headers.query.password == "") { headers = `403 Please enter your password and try again minisrv-no-mail-count: true @@ -73,9 +72,10 @@ minisrv-no-mail-count: true if (session_data.baddisk === true) { gourl = "wtv-head-waiter:/bad-disk?" } - else if (session_data.getNumberOfUserAccounts() > 1 && user_id === 0 && request_headers.query.initial_login) { + else if (session_data.getNumberOfUserAccounts() > 1 && user_id === 0 && (request_headers.query.initial_login || request_headers.query.relogin)) { gourl = "wtv-head-waiter:/choose-user?" } else { + if (!session_data.getUserPasswordEnabled() && request_headers.query.user_login) session_data.setUserLoggedIn(true); var limitedLogin = (!session_data.lockdown && (!session_data.get('password_valid') && session_data.getUserPasswordEnabled())); var limitedLoginRegistered = (limitedLogin && session_data.isRegistered()); } @@ -89,7 +89,7 @@ Content-Type: text/html`; wtv-encrypted: true`; if (wtvsec_login) session_data.data_store.wtvsec_login.update_ticket = true; } - if (limitedLoginRegistered) gourl = "wtv-head-waiter:/password?"; + if (limitedLoginRegistered && session_data.getUserPasswordEnabled()) gourl = "wtv-head-waiter:/password?"; headers += ` wtv-visit: ${gourl}`; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/choose-user.js b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/choose-user.js index f6bd3f3d..7668ec4e 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/choose-user.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/choose-user.js @@ -1,6 +1,9 @@ var minisrv_service_file = true; -if (socket.ssid !== null) session_data.switchUserID(0); +if (socket.ssid !== null) { + session_data.switchUserID(0); + session_data.setUserLoggedIn(false); +} headers = `200 OK minisrv-no-mail-count: true diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login-stage-two.js b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login-stage-two.js index e74c4768..4618e857 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login-stage-two.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login-stage-two.js @@ -9,6 +9,8 @@ if (gourl) { wtv-open-isp-disabled: false `; if (!session_data.isRegistered() && (!request_headers.query.guest_login || !minisrv_config.config.allow_guests)) { + // fake logged in for reg + session_data.setUserLoggedIn(true); headers += `wtv-encrypted: true ${getServiceString('wtv-register')} ${getServiceString('wtv-head-waiter')} @@ -47,12 +49,13 @@ else { var gourl = "wtv-home:/splash?"; } var limitedLogin = session_data.lockdown; - var limitedLoginRegistered = (limitedLogin || (session_data.isRegistered() && !session_data.isUserLoggedIn())); + var limitedLoginRegistered = (limitedLogin || (session_data.isRegistered() && !session_data.isUserLoggedIn()) && session_data.getUserPasswordEnabled()); + if (!session_data.getUserPasswordEnabled()) session_data.setUserLoggedIn(true); var offline_user_list = null; if (session_data.isRegistered()) { // check for SMTP Password if (session_data.getSessionData("subscriber_smtp_password") === null) { - session_data.setUserSMTPPassword(session_data.generatePassword(16)); + session_data.setUserSMTPPassword(wtvshared.generatePassword(16)); } if (session_data.user_id == 0) { var accounts = session_data.listPrimaryAccountUsers(); diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login.js b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login.js index 4351a0a4..4a971720 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login.js @@ -4,47 +4,47 @@ session_data.setUserLoggedIn(false); var challenge_response, challenge_header = ""; if (socket.ssid !== null) session_data.switchUserID(0); -var gourl = "wtv-head-waiter:/ValidateLogin?initial_login=true&"; +var gourl = "wtv-head-waiter:/ValidateLogin?"; if (request_headers.query.relogin) gourl += "relogin=true"; else if (request_headers.query.reconnect) gourl += "reconnect=true"; +else gourl += "initial_login=true" if (request_headers.query.guest_login) { - if (request_headers.query.relogin || request_headers.query.reconnect) gourl += "&"; + if (gourl.substr(-1) != "?") gourl += "&"; gourl += "guest_login=true"; if (request_headers.query.skip_splash) gourl += "&skip_splash=true"; } var send_to_relogin = true; -if (socket.ssid) { - if (session_data) { - if (request_headers["wtv-ticket"]) { - if (session_data.data_store.wtvsec_login.ticket_b64 == null) { - if (request_headers["wtv-ticket"].length > 8) { - session_data.data_store.wtvsec_login.DecodeTicket(request_headers["wtv-ticket"]); - session_data.data_store.wtvsec_login.ticket_b64 = request_headers["wtv-ticket"]; - send_to_relogin = false; - } +if (session_data) { + if (request_headers["wtv-ticket"]) { + if (session_data.data_store.wtvsec_login.ticket_b64 == null) { + if (request_headers["wtv-ticket"].length > 8) { + session_data.data_store.wtvsec_login.DecodeTicket(request_headers["wtv-ticket"]); + session_data.data_store.wtvsec_login.ticket_b64 = request_headers["wtv-ticket"]; + send_to_relogin = false; } - } else { - if (session_data.data_store.wtvsec_login) { - var client_challenge_response = request_headers["wtv-challenge-response"] || null; - if (challenge_response && client_challenge_response) { - if (challenge_response.toString(CryptoJS.enc.Base64).substring(0, 85) == client_challenge_response.substring(0, 85)) { - console.log(" * wtv-challenge-response success for " + socket.ssid); - session_data.data_store.wtvsec_login.PrepareTicket(); - send_to_relogin = false; - } else { - challenge_header = "wtv-challenge: " + session_data.data_store.wtvsec_login.IssueChallenge(); - send_to_relogin = false; - } + } + } else { + if (session_data.data_store.wtvsec_login) { + var client_challenge_response = request_headers["wtv-challenge-response"] || null; + if (challenge_response && client_challenge_response) { + if (challenge_response.toString(CryptoJS.enc.Base64).substring(0, 85) == client_challenge_response.substring(0, 85)) { + console.log(" * wtv-challenge-response success for " + socket.ssid); + session_data.data_store.wtvsec_login.PrepareTicket(); + send_to_relogin = false; } else { challenge_header = "wtv-challenge: " + session_data.data_store.wtvsec_login.IssueChallenge(); send_to_relogin = false; } + } else { + challenge_header = "wtv-challenge: " + session_data.data_store.wtvsec_login.IssueChallenge(); + send_to_relogin = false; } } } + session_data.setUserLoggedIn(send_to_relogin); } if (!send_to_relogin) { @@ -66,7 +66,6 @@ Content-type: text/html`; data = ''; } else { - headers = `200 OK Connection: Keep-Alive Expires: Wed, 09 Oct 1991 22:00:00 GMT diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/relogin.js b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/relogin.js index aa2f54e4..cd040a39 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/relogin.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/relogin.js @@ -1,4 +1,5 @@ var minisrv_service_file = true; + session_data.setUserLoggedIn(false); var gourl = "wtv-1800:/preregister?"; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js b/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js index 56cf5f78..93b41609 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js @@ -38,10 +38,10 @@ Content-type: text/html`| @@ -57,12 +57,12 @@ Content-type: text/html` |
|
|
|
-
|
- | 
+ 
@@ -241,7 +241,7 @@ Content-type: text/html`
|
|
| - Search + Search |