guacamole-client
guacamole-client copied to clipboard
GUACAMOLE-1056: Add support for tracking the time drift between guacamole and TOTP-tokens
We added a new attribute for storing the value of the time drift next to the TOTP-Key. The module will accept 3 codes, one previous, one on time and one in the future. Depending on the accepted code the value will be decremented (previous) or incremented (future) or unchanged (on time). The new value will be used to compensate the timedrift on the next login.
You have an extra commit (8239c16), now, that needs to be removed.
You have an extra commit (8239c16), now, that needs to be removed.
Commit removed, I was created by resolving the conflict. Now it's present again. What have I to do to resolve it?
What have I to do to resolve it?
Make sure that your forked copy of the master
branch of the repo is up-to-date, and then rebase your TOTPTimeDrift
branch on top of master
via the command git rebase master
. You'll likely run into the conflicts there and you'll need to resolve them.
I seeams that I did it correct now. @necouchman Thank you for your help.
I do not have time drift problems but I would nevertheless love to see this integrated to avoid issues around the time when a code expires and a new one must be used.