1
0
mirror of https://github.com/krateng/maloja.git synced 2023-08-10 21:12:55 +03:00

All POST methods now require an API key

This commit is contained in:
Krateng 2018-12-29 16:57:52 +01:00
parent 6082094a3e
commit bfff37a549
3 changed files with 83 additions and 27 deletions

View File

@ -419,10 +419,13 @@ def abouttoshutdown():
@dbserver.post("/newrule") @dbserver.post("/newrule")
def newrule(): def newrule():
keys = FormsDict.decode(request.forms) keys = FormsDict.decode(request.forms)
apikey = keys.pop("key",None)
if (checkAPIkey(apikey)):
addEntry("rules/webmade.tsv",[k for k in keys]) addEntry("rules/webmade.tsv",[k for k in keys])
global db_rulestate global db_rulestate
db_rulestate = False db_rulestate = False
@dbserver.route("/issues") @dbserver.route("/issues")
def issues(): def issues():
combined = [] combined = []
@ -516,6 +519,8 @@ def issues():
@dbserver.post("/rebuild") @dbserver.post("/rebuild")
def rebuild(): def rebuild():
apikey = keys.pop("key",None)
if (checkAPIkey(apikey)):
global db_rulestate global db_rulestate
db_rulestate = False db_rulestate = False
sync() sync()

View File

@ -16,7 +16,8 @@
<span>with your library</span> <span>with your library</span>
<p class="stats"><a href="/scrobbles?artist=KEY_ENC_ARTISTNAME">KEY_ISSUES Issues</a></p> <p class="stats"><a href="/scrobbles?artist=KEY_ENC_ARTISTNAME">KEY_ISSUES Issues</a></p>
<p>Maloja can identify possible problems with consistency or redundancy in your library. After making any changes, you should <a onclick='fullrebuild()'>rebuild your library</a>.</p> <p>Maloja can identify possible problems with consistency or redundancy in your library. After making any changes, you should <a onclick='fullrebuild()'>rebuild your library</a>.<br/>
Your API key is required to make any changes to the server: <input id='apikey' onchange='checkAPIkey()' style='width:300px;'/></p>
</td> </td>
</tr> </tr>
</table> </table>
@ -26,27 +27,77 @@
</body> </body>
<script> <script>
cookies = decodeURIComponent(document.cookie).split(';');
for(var i = 0; i <cookies.length; i++) {
if (cookies[i].startsWith("apikey=")) {
document.getElementById("apikey").value = cookies[i].replace("apikey=","")
checkAPIkey()
}
}
apikeycorrect = false;
function newrule() { function newrule() {
if (apikeycorrect) {
keys = "" keys = ""
for (var i = 1; i < arguments.length; i++) { for (var i = 1; i < arguments.length; i++) {
keys += encodeURIComponent(arguments[i]) + "&" keys += encodeURIComponent(arguments[i]) + "&"
} }
apikey = document.getElementById("apikey").value
keys += "key=" + encodeURIComponent(apikey)
console.log(keys) console.log(keys)
var xhttp = new XMLHttpRequest(); var xhttp = new XMLHttpRequest();
xhttp.open("POST","/db/newrule?", true); xhttp.open("POST","/db/newrule?", true);
xhttp.send(keys); xhttp.send(keys);
e = arguments[0] e = arguments[0]
line = e.parentNode line = e.parentNode
line.parentNode.removeChild(line) line.parentNode.removeChild(line)
}
} }
function fullrebuild() { function fullrebuild() {
if (apikeycorrect) {
apikey = document.getElementById("apikey").value
var xhttp = new XMLHttpRequest(); var xhttp = new XMLHttpRequest();
xhttp.open("POST","/db/rebuild", true); xhttp.open("POST","/db/rebuild", true);
xhttp.send() xhttp.send("key=" + encodeURIComponent(apikey))
window.location = "/wait"; window.location = "/wait";
} }
}
function saveAPIkey() {
key = document.getElementById("apikey").value
document.cookie = "apikey=" + encodeURIComponent(key)
}
function checkAPIkey() {
saveAPIkey()
url = "/db/test?key=" + document.getElementById("apikey").value
var xhttp = new XMLHttpRequest();
xhttp.onreadystatechange = function() {
if (this.readyState == 4 && (this.status == 204 || this.status == 205)) {
document.getElementById("apikey").style.backgroundColor = "lawngreen"
apikeycorrect = true
}
else {
document.getElementById("apikey").style.backgroundColor = "red"
apikeycorrect = false
}
};
try {
xhttp.open("GET",url,true);
xhttp.send();
}
catch (e) {
document.getElementById("apikey").style.backgroundColor = "red"
apikeycorrect = false
}
}
</script> </script>
</html> </html>

View File

@ -1,6 +1,6 @@
import urllib import urllib
import json import json
from utilities import artistLink from htmlgenerators import artistLink
def replacedict(keys,dbport): def replacedict(keys,dbport):