simplewallet: Add Unicode input_line [Ryo backport] #4390

fireice-uk · 2018-09-16T18:36:44Z

Issue description : ryo-currency/ryo-currency#102
Monero Issue : #4351

moneromooo-monero · 2018-09-16T18:43:18Z

src/common/command_line.cpp

@@ -36,6 +36,14 @@
 #include "cryptonote_config.h"
 #include "string_tools.h"

+#ifdef WIN32


Please use _WIN32 (apparently WIN32 is only defined if you've got the right include included already, so it's error prone)

What you are thinking is MSVC defines (not that the code compiles there anyway), but sure.

No idea about windows. I'm repeating what I was told by someone who does know, but maybe I'm assuming things. If you think that is wrong, explain why.

To put it in simple terms:

gcc defines WIN32 and _WIN32
msvc defines _WIN32

You use WIN32 (and I did out of laziness), however you suggestion is better practice.

moneromooo-monero · 2018-09-16T18:47:42Z

src/common/command_line.cpp

+    int size_needed = WideCharToMultiByte(CP_UTF8, 0, buffer, -1, NULL, 0, NULL, NULL);
+    std::string buf(size_needed, '\0');
+    WideCharToMultiByte(CP_UTF8, 0, buffer, -1, &buf[0], size_needed, NULL, NULL);
+    buf.pop_back(); //size_needed includes null that we needed to have space for


Can you move that inner code to util please, it seems generally useful. It also has nothing to do with command line. Without the trim seems best. Then you can have the input_line kept in simplewallet calling it and trimming. Also gets rid of all the diff spam due to namespaces below.

What do you mean by inner code -> UCS2 conversion? Or do you want the read_line to act as a wrapper on win?

I mean the whole code except the trim, which is simplewallet specific, as it's not a canonical way to behave for a line reading function. So simplewallet would keep a function that calls the utils input function, then trims.

moneromooo-monero · 2018-09-16T18:48:00Z

src/common/command_line.cpp

+    buffer[read] = 0;
+
+    SetConsoleMode(hConIn, oldMode);
+    CloseHandle(hConIn);


Any of those return error codes that need checking ?

I subscribe to school that return codes should be checked if something can be done about it. Here the only thing available would be to throw.

fireice-uk · 2018-09-17T11:41:37Z

Let me know if that's what you meant. Note I made a reply on the collapsed topic here : #4390 (comment)

moneromooo-monero · 2018-09-17T11:48:50Z

Yes, that is what I meant. Note that seeds are input via input_secure_line, not input_line, so that one will also have to be changed.

fireice-uk · 2018-09-17T11:51:11Z

Looks like something you merged after the base of this PR. Hold on, let me rebase then.

fireice-uk · 2018-09-17T12:12:38Z

Ok, looks like someone already did most of the work on that one for me, apart from failing to call the correct API (ReadConsoleW), that should be ez.

One note the existing code. UTF8 characters can be up to 4 bytes long. This kind of thing makes people scream in agony:

char ch; r = (TRUE == ::ReadConsoleA(h_cin, &ch, 1, &read, NULL));

fireice-uk · 2018-09-17T12:34:14Z

src/common/password.cpp

@@ -56,8 +56,6 @@ namespace

  bool read_from_tty(epee::wipeable_string& pass, bool hide_input)
  {
-    static constexpr const char BACKSPACE = 8;


I have no idea why someone chose to do this instead of using \b

Most likely for symmetry with the Unix routine (which used BACKSPACE = 127, ASCII DEL). I'd suggest preserving this line. Although I would have named them both DELETE, not BACKSPACE.

fireice-uk · 2018-09-17T12:36:15Z

Ok. Done. The second commit adds proper handling of multibyte characters.

Note: Please check whether the code actually builds, I wrote it totally "dry" on Linux.

moneromooo-monero · 2018-09-17T13:52:24Z

Ah, my mistake. I had been assuming you'd actually tried it at least once. If not, then we'll wait some more for a Windows coder to show up and do it.

fireice-uk · 2018-09-17T14:19:28Z

That's fine - if you are short on manpower I can do it tomorrow evening. It is purely a matter of me having to power down and switch to Windows.

moneromooo-monero · 2018-09-17T14:32:11Z

OK, that's fine. It's not like we're in a hurry about this now.

fireice-uk · 2018-09-19T12:42:06Z

@moneromooo-monero Compiled it on win and fixed two minor build errors. I think that's everything from my end.

hyc · 2018-09-28T15:05:27Z

src/common/password.cpp

+      if((len = WideCharToMultiByte(CP_UTF8, 0, &ucs2_ch, 1, utf8_ch, sizeof(utf8_ch), NULL, NULL)) <= 0)
+        break;
+
+      chlen.push_back(len);


It's possible for the UTF8 char to push pass.size() over the max_password_size. Should check the length and break out of the loop here, before appending the new character.

I think it's bad practice to just silently return with whatever was read so far, but the existing code already does this. And I suppose the likelihood of anyone entering such a long password is low to begin with, so maybe not a serious problem.

hyc · 2018-09-28T15:07:08Z

src/common/util.cpp

+    HANDLE hConIn = CreateFileW(L"CONIN$", GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, OPEN_EXISTING, 0, nullptr);
+    DWORD oldMode;
+
+    FlushConsoleInputBuffer(hConIn);


Why can't we just use STD_INPUT_HANDLE here?

The Unix version will work with input redirection. I don't see why we should break that for Windows.

hyc · 2018-09-28T15:08:13Z

src/simplewallet/simplewallet.cpp

@@ -187,9 +146,10 @@ namespace
    std::cout << prompt;

    std::string buf;
+#ifdef _WIN32
+    buf = tools::input_line_win();


Probably should have emulated std::getline() semantics instead, e.g.
tools::getline(buf);

This paradigm is actually faster in C++11 onwards (copy elision).

moneromooo-monero · 2018-10-01T11:12:09Z

The buffer overflow should be fixed at least. If you want this in 0.13, fix it quick please.

fireice-uk · 2018-10-04T17:01:07Z

@moneromooo-monero reserve is purely a memory optimisation - a C++ vector is dynamically sized (that's kind of the point), so there is no overflow here - not sure about any other code. I can add a break if it is exceeded if you want though, it is two lines after-all =).

fireice-uk · 2018-10-04T17:17:19Z

Let me know if that's what you meant. Whenever dealing with Unicode you should really delete all size variables. You need to be specific whether you mean bytes, characters or glyphs since the count of all three can be different.

hyc · 2018-10-04T17:28:57Z

src/common/password.cpp

+      if((len = WideCharToMultiByte(CP_UTF8, 0, &ucs2_ch, 1, utf8_ch, sizeof(utf8_ch), NULL, NULL)) <= 0)
+        break;
+
+      if(std::accumulate(chlen.begin(), chlen.end(), 0) + len >= tools::password_container::max_password_size)


if(pass.size() + len >= tools::password_container::max_password_size)

hyc · 2018-10-04T17:39:58Z

In this context we have to assume size means bytes.

moneromooo-monero · 2018-10-04T18:06:40Z

Could be, I didn't look at the code hyc pointed out. If there's a bug, then it needs fixing. If it's just a misunderstanding, then it can be merged now.

fluffypony

Reviewed

a061353 secure_pwd_reader: Add proper Unicode handling [Ryo contribution] (fireice-uk) 579383c simplewallet: Add Unicode input_line [Ryo backport] (fireice-uk)

moneromooo-monero reviewed Sep 16, 2018

View reviewed changes

fireice-uk force-pushed the topic-unicode-support branch from c43d896 to 7852402 Compare September 17, 2018 10:22

fireice-uk force-pushed the topic-unicode-support branch from 7852402 to e08ab7d Compare September 17, 2018 12:07

fireice-uk commented Sep 17, 2018

View reviewed changes

simplewallet: Add Unicode input_line [Ryo backport]

579383c

fireice-uk force-pushed the topic-unicode-support branch from 3b2c819 to 56cbf00 Compare September 19, 2018 12:39

hyc reviewed Sep 28, 2018

View reviewed changes

fireice-uk force-pushed the topic-unicode-support branch from 56cbf00 to 8823d78 Compare October 4, 2018 17:15

hyc reviewed Oct 4, 2018

View reviewed changes

secure_pwd_reader: Add proper Unicode handling [Ryo contribution]

a061353

fireice-uk force-pushed the topic-unicode-support branch from 8823d78 to a061353 Compare October 4, 2018 18:32

fluffypony approved these changes Oct 5, 2018

View reviewed changes

fluffypony merged commit a061353 into monero-project:master Oct 5, 2018

fluffypony added a commit that referenced this pull request Oct 5, 2018

Merge pull request #4390

445d9c8

a061353 secure_pwd_reader: Add proper Unicode handling [Ryo contribution] (fireice-uk) 579383c simplewallet: Add Unicode input_line [Ryo backport] (fireice-uk)

fluffypony added a commit that referenced this pull request Oct 6, 2018

Merge pull request #4390

9556ba0

a061353 secure_pwd_reader: Add proper Unicode handling [Ryo contribution] (fireice-uk) 579383c simplewallet: Add Unicode input_line [Ryo backport] (fireice-uk)

stoffu mentioned this pull request Jul 14, 2020

Aeon upstream 10 aeonix/aeon#189

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

simplewallet: Add Unicode input_line [Ryo backport] #4390

simplewallet: Add Unicode input_line [Ryo backport] #4390

fireice-uk commented Sep 16, 2018

moneromooo-monero Sep 16, 2018

fireice-uk Sep 16, 2018

moneromooo-monero Sep 16, 2018

fireice-uk Sep 17, 2018

moneromooo-monero Sep 16, 2018

fireice-uk Sep 16, 2018

moneromooo-monero Sep 16, 2018

moneromooo-monero Sep 16, 2018

fireice-uk Sep 16, 2018

fireice-uk commented Sep 17, 2018 •

edited

Loading

moneromooo-monero commented Sep 17, 2018

fireice-uk commented Sep 17, 2018

fireice-uk commented Sep 17, 2018

fireice-uk Sep 17, 2018

hyc Sep 28, 2018

fireice-uk commented Sep 17, 2018 •

edited

Loading

moneromooo-monero commented Sep 17, 2018

fireice-uk commented Sep 17, 2018

moneromooo-monero commented Sep 17, 2018

fireice-uk commented Sep 19, 2018

hyc Sep 28, 2018

hyc Sep 28, 2018

hyc Sep 28, 2018

fireice-uk Oct 4, 2018

moneromooo-monero commented Oct 1, 2018

fireice-uk commented Oct 4, 2018 •

edited

Loading

fireice-uk commented Oct 4, 2018

hyc Oct 4, 2018

fireice-uk Oct 4, 2018

hyc commented Oct 4, 2018

moneromooo-monero commented Oct 4, 2018 •

edited

Loading

fluffypony left a comment

simplewallet: Add Unicode input_line [Ryo backport] #4390

simplewallet: Add Unicode input_line [Ryo backport] #4390

Conversation

fireice-uk commented Sep 16, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fireice-uk commented Sep 17, 2018 • edited Loading

moneromooo-monero commented Sep 17, 2018

fireice-uk commented Sep 17, 2018

fireice-uk commented Sep 17, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fireice-uk commented Sep 17, 2018 • edited Loading

moneromooo-monero commented Sep 17, 2018

fireice-uk commented Sep 17, 2018

moneromooo-monero commented Sep 17, 2018

fireice-uk commented Sep 19, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

moneromooo-monero commented Oct 1, 2018

fireice-uk commented Oct 4, 2018 • edited Loading

fireice-uk commented Oct 4, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hyc commented Oct 4, 2018

moneromooo-monero commented Oct 4, 2018 • edited Loading

fluffypony left a comment

Choose a reason for hiding this comment

fireice-uk commented Sep 17, 2018 •

edited

Loading

fireice-uk commented Sep 17, 2018 •

edited

Loading

fireice-uk commented Oct 4, 2018 •

edited

Loading

moneromooo-monero commented Oct 4, 2018 •

edited

Loading