Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ec-851 #420

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

ec-851 #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6d229a
ask password for every wallet operation
liorl00 Feb 6, 2020
ba04506
Merge branch 'master' into ec-851
liorl00 Feb 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions src/main/scala/encry/EncryApp.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ object EncryApp extends App with StrictLogging {
)
}

def startHttp(dataHolderForApi: ActorRef, memoryPool: ActorRef) =
if (settings.restApi.enabled.getOrElse(false)) {
def startHttp(dataHolderForApi: ActorRef, memoryPool: ActorRef, newSettings: EncryAppSettings) =
if (newSettings.restApi.enabled.getOrElse(false)) {
import akka.http.scaladsl.model.StatusCodes._
import akka.http.scaladsl.server.Directives._

Expand All @@ -87,23 +87,23 @@ object EncryApp extends App with StrictLogging {
}

val apiRoutes: Seq[ApiRoute] = Seq(
WebRoute(settings.restApi, settings.node, dataHolderForApi),
WalletRoute(settings.restApi, dataHolderForApi, settings),
PeersRoute(settings.restApi, settings.node, dataHolderForApi),
PeersConnectedRoute(settings.restApi, dataHolderForApi),
BanPeersRoute(settings.restApi, dataHolderForApi),
ArgonRoute(settings.restApi),
PeersApiRoute(settings.restApi, dataHolderForApi),
InfoApiRoute(dataHolderForApi, settings.restApi, nodeId, timeProvider),
HistoryApiRoute(dataHolderForApi, settings.restApi, nodeId),
TransactionsApiRoute(dataHolderForApi, memoryPool, settings.restApi),
WalletInfoApiRoute(dataHolderForApi, settings.restApi, Algos.encode(settings.constants.IntrinsicTokenId)),
NodeRoute(dataHolderForApi, settings.restApi)
WebRoute(newSettings.restApi, newSettings.node, dataHolderForApi),
WalletRoute(newSettings.restApi, dataHolderForApi, newSettings),
PeersRoute(newSettings.restApi, newSettings.node, dataHolderForApi),
PeersConnectedRoute(newSettings.restApi, dataHolderForApi),
BanPeersRoute(newSettings.restApi, dataHolderForApi),
ArgonRoute(newSettings.restApi),
PeersApiRoute(newSettings.restApi, dataHolderForApi),
InfoApiRoute(dataHolderForApi, newSettings.restApi, nodeId, timeProvider),
HistoryApiRoute(dataHolderForApi, newSettings.restApi, nodeId),
TransactionsApiRoute(dataHolderForApi, memoryPool, newSettings.restApi),
WalletInfoApiRoute(dataHolderForApi, newSettings.restApi, Algos.encode(newSettings.constants.IntrinsicTokenId)),
NodeRoute(dataHolderForApi, newSettings.restApi)
)
Http().bindAndHandle(
CompositeHttpService(system, apiRoutes, settings.restApi, swaggerConfig).compositeRoute,
settings.restApi.bindAddress.getAddress.getHostAddress,
settings.restApi.bindAddress.getPort
CompositeHttpService(system, apiRoutes, newSettings.restApi, swaggerConfig).compositeRoute,
newSettings.restApi.bindAddress.getAddress.getHostAddress,
newSettings.restApi.bindAddress.getPort
)
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/encry/Starter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ class Starter(settings: EncryAppSettings,
context.system.actorSelection("/user/cliListener") ! StartListening
}

EncryApp.startHttp(dataHolderForApi, memoryPool)
EncryApp.startHttp(dataHolderForApi, memoryPool, newSettings)
}
}

Expand Down
46 changes: 40 additions & 6 deletions src/main/scala/encry/api/http/routes/WalletRoute.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ case class WalletRoute(settings: RESTApiSettings,
} yield (wallet, pubKeys)

def walletScript(balances: Map[String, List[(String, Amount)]]): Text.TypedTag[String] = {

html(
scalatags.Text.all.head(
meta(charset := "utf-8"),
Expand Down Expand Up @@ -90,6 +89,9 @@ case class WalletRoute(settings: RESTApiSettings,
script(
raw(
s"""function wallet(){
var password;
password=prompt('Please enter your password to view this page!',' ');
if(password == "${encrySettings.wallet.map(_.password).getOrElse("")}") {
if(validateTransferForm()){
var addr = document.forms["myForm"]["addr"].value;
var fee = document.forms["myForm"]["fee"].value;
Expand All @@ -105,6 +107,10 @@ case class WalletRoute(settings: RESTApiSettings,
window.alert("Transaction was created and sent to node");
setTimeout(location.reload.bind(location), 3000);
}
}
else {
window.alert("Password is incorrect, please try again.")
}
}""")
),
script(
Expand All @@ -131,6 +137,9 @@ case class WalletRoute(settings: RESTApiSettings,
raw(
s"""
function contractF(){
var password;
password=prompt('Please enter your password to view this page!',' ');
if(password == "${encrySettings.wallet.map(_.password).getOrElse("")}") {
if(validateContractForm()){
var contract = document.forms["myForm4"]["contract"].value;
var fee = document.forms["myForm4"]["fee"].value;
Expand All @@ -146,6 +155,10 @@ case class WalletRoute(settings: RESTApiSettings,
window.alert("Transaction was created and sent to node");
setTimeout(location.reload.bind(location), 3000);
}
}
else{
window.alert("Password is incorrect, please try again.")
}
}""")
),
script(
Expand All @@ -165,7 +178,10 @@ case class WalletRoute(settings: RESTApiSettings,
),
script(
raw(
"""function token(){
s"""function token(){
var password;
password=prompt('Please enter your password to view this page!',' ');
if(password == "${encrySettings.wallet.map(_.password).getOrElse("")}") {
if (validateForm1()){
var fee = document.forms["myForm1"]["fee"].value;
var amount = document.forms["myForm1"]["amount"].value;
Expand All @@ -175,6 +191,10 @@ case class WalletRoute(settings: RESTApiSettings,
window.alert("Transaction with token creation was created and sent to node");
setTimeout(location.reload.bind(location), 3000);
}
}
else{
window.alert("Password is incorrect, please try again.")
}
}""")
),
script(
Expand All @@ -194,7 +214,10 @@ case class WalletRoute(settings: RESTApiSettings,
),
script(
raw(
"""function dataTx(){
s"""function dataTx(){
var password;
password=prompt('Please enter your password to view this page!',' ');
if(password == "${encrySettings.wallet.map(_.password).getOrElse("")}") {
if(validateDataForm()) {
var fee = document.forms["myForm2"]["fee"].value;
var data = document.forms["myForm2"]["data"].value;
Expand All @@ -204,16 +227,27 @@ case class WalletRoute(settings: RESTApiSettings,
window.alert("Data transaction was created and sent to node");
setTimeout(location.reload.bind(location), 3000);
}
}
else {
window.alert("Password is incorrect, please try again.")
}
}""")
),
script(
raw(
"""function keyCreate() {
var request = new XMLHttpRequest();
s"""function keyCreate() {
var password;
password=prompt('Please enter your password to view this page!',' ');
if(password == "${encrySettings.wallet.map(_.password).getOrElse("")}") {
var request = new XMLHttpRequest();
request.open('GET', "/wallet/createKey");
request.send();
window.alert("Key created successfully");
window.alert("Key created successfully");
setTimeout(location.reload.bind(location), 1500);
}
else {
window.alert("Password is incorrect, please try again.")
}
}""")
),

Expand Down