Skip to content

Commit 0ab1f0c

Browse files
AKotov-devAKotov-dev
committed
v0.3 + Re-creating SSH keys (changing server password, etc.)
1 parent b3607aa commit 0ab1f0c

File tree

7 files changed

+28
-255
lines changed

7 files changed

+28
-255
lines changed

‎sshuttle-gui/backup/sshuttle_gui.lps‎

Lines changed: 8 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@
3838
<Unit>
3939
<Filename Value="sshuttle_gui.lpr"/>
4040
<IsPartOfProject Value="True"/>
41-
<EditorIndex Value="1"/>
41+
<EditorIndex Value="-1"/>
4242
<UsageCount Value="38"/>
43-
<Loaded Value="True"/>
4443
</Unit>
4544
<Unit>
4645
<Filename Value="unit1.pas"/>
@@ -49,8 +48,9 @@
4948
<HasResources Value="True"/>
5049
<ResourceBaseClass Value="Form"/>
5150
<UnitName Value="Unit1"/>
52-
<CursorPos X="68" Y="9"/>
53-
<ComponentState Value="1"/>
51+
<IsVisibleTab Value="True"/>
52+
<TopLine Value="195"/>
53+
<CursorPos X="21" Y="212"/>
5454
<UsageCount Value="38"/>
5555
<Loaded Value="True"/>
5656
<LoadedDesigner Value="True"/>
@@ -59,11 +59,9 @@
5959
<Filename Value="pingtrd.pas"/>
6060
<IsPartOfProject Value="True"/>
6161
<UnitName Value="PingTRD"/>
62-
<IsVisibleTab Value="True"/>
63-
<EditorIndex Value="2"/>
62+
<EditorIndex Value="-1"/>
6463
<CursorPos X="15"/>
6564
<UsageCount Value="34"/>
66-
<Loaded Value="True"/>
6765
</Unit>
6866
<Unit>
6967
<Filename Value="start_trd.pas"/>
@@ -73,126 +71,14 @@
7371
<UsageCount Value="35"/>
7472
</Unit>
7573
</Units>
76-
<JumpHistory HistoryIndex="29">
77-
<Position>
78-
<Filename Value="unit1.pas"/>
79-
<Caret Line="189" Column="20" TopLine="167"/>
80-
</Position>
81-
<Position>
82-
<Filename Value="unit1.pas"/>
83-
<Caret Line="133" Column="3" TopLine="131"/>
84-
</Position>
85-
<Position>
86-
<Filename Value="unit1.pas"/>
87-
<Caret Line="132" Column="3" TopLine="130"/>
88-
</Position>
89-
<Position>
90-
<Filename Value="unit1.pas"/>
91-
<Caret Line="49" Column="53" TopLine="35"/>
92-
</Position>
93-
<Position>
94-
<Filename Value="unit1.pas"/>
95-
<Caret Line="182" Column="53" TopLine="161"/>
96-
</Position>
97-
<Position>
98-
<Filename Value="unit1.pas"/>
99-
<Caret Line="194" Column="5" TopLine="179"/>
100-
</Position>
101-
<Position>
102-
<Filename Value="unit1.pas"/>
103-
<Caret Line="56" Column="6" TopLine="34"/>
104-
</Position>
105-
<Position>
106-
<Filename Value="unit1.pas"/>
107-
<Caret Line="55" Column="6" TopLine="33"/>
108-
</Position>
109-
<Position>
110-
<Filename Value="unit1.pas"/>
111-
<Caret Line="45" TopLine="45"/>
112-
</Position>
113-
<Position>
114-
<Filename Value="unit1.pas"/>
115-
<Caret Line="106" Column="2" TopLine="98"/>
116-
</Position>
117-
<Position>
118-
<Filename Value="unit1.pas"/>
119-
<Caret Line="148" TopLine="143"/>
120-
</Position>
121-
<Position>
122-
<Filename Value="unit1.pas"/>
123-
<Caret Line="105" Column="80" TopLine="98"/>
124-
</Position>
125-
<Position>
126-
<Filename Value="unit1.pas"/>
127-
<Caret Line="181" Column="58" TopLine="164"/>
128-
</Position>
129-
<Position>
130-
<Filename Value="unit1.pas"/>
131-
<Caret Line="182" Column="58" TopLine="165"/>
132-
</Position>
133-
<Position>
134-
<Filename Value="unit1.pas"/>
135-
<Caret Line="174" Column="19" TopLine="166"/>
136-
</Position>
137-
<Position>
138-
<Filename Value="unit1.pas"/>
139-
<Caret Line="153" Column="3" TopLine="148"/>
140-
</Position>
141-
<Position>
142-
<Filename Value="unit1.pas"/>
143-
<Caret Line="50" Column="17" TopLine="37"/>
144-
</Position>
145-
<Position>
146-
<Filename Value="unit1.pas"/>
147-
<Caret Line="203" TopLine="178"/>
148-
</Position>
149-
<Position>
150-
<Filename Value="unit1.pas"/>
151-
<Caret Line="166" Column="53" TopLine="154"/>
152-
</Position>
153-
<Position>
154-
<Filename Value="unit1.pas"/>
155-
<Caret Line="202" TopLine="173"/>
156-
</Position>
157-
<Position>
158-
<Filename Value="unit1.pas"/>
159-
<Caret Line="201" TopLine="172"/>
160-
</Position>
161-
<Position>
162-
<Filename Value="unit1.pas"/>
163-
<Caret Line="163" TopLine="153"/>
164-
</Position>
165-
<Position>
166-
<Filename Value="unit1.pas"/>
167-
<Caret Line="155" Column="11" TopLine="140"/>
168-
</Position>
169-
<Position>
170-
<Filename Value="unit1.pas"/>
171-
<Caret Line="167" Column="28" TopLine="158"/>
172-
</Position>
173-
<Position>
174-
<Filename Value="unit1.pas"/>
175-
<Caret Line="162" Column="24" TopLine="152"/>
176-
</Position>
177-
<Position>
178-
<Filename Value="unit1.pas"/>
179-
<Caret Line="147" Column="23" TopLine="21"/>
180-
</Position>
181-
<Position>
182-
<Filename Value="unit1.pas"/>
183-
<Caret Line="170" Column="17" TopLine="158"/>
184-
</Position>
185-
<Position>
186-
<Filename Value="unit1.pas"/>
187-
<Caret Line="149" Column="76" TopLine="144"/>
188-
</Position>
74+
<JumpHistory HistoryIndex="1">
18975
<Position>
19076
<Filename Value="unit1.pas"/>
191-
<Caret Line="154" Column="28" TopLine="144"/>
77+
<Caret Column="13"/>
19278
</Position>
19379
<Position>
19480
<Filename Value="unit1.pas"/>
195-
<Caret Line="190" Column="78" TopLine="174"/>
81+
<Caret Line="199" Column="65" TopLine="174"/>
19682
</Position>
19783
</JumpHistory>
19884
<RunParams>

‎sshuttle-gui/backup/unit1.pas‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,18 +185,18 @@ procedure TMainForm.StartBtnClick(Sender: TObject);
185185
S.Add('');
186186

187187
//Содаём пускач для systemd (Type=simple)
188-
S.Add('# Проверка наличия валидных ключей /root/.ssh/{known_hosts,known_hosts.old}');
188+
S.Add('# Пересоздание ключей в /root/.ssh/known_hosts (пароль мог изменяться)');
189189

190190
//Очистка прежних ключей (мог измениться пароль или хост)
191191
S.Add('sed -i "/^' + Trim(ServerEDit.Text) + '/d" /root/.ssh/known_hosts');
192192

193-
{ S.Add('if [[ ! -f /root/.ssh/known_hosts.old ]] || [[ -z $(ssh-keygen -F ' +
194-
Trim(ServerEDit.Text) + ') ]]; then'); }
193+
{ S.Add('if [[ -z $(ssh-keygen -F ' + Trim(ServerEDit.Text) + ') ]]; then'); }
195194

196-
S.Add('sshpass -p "' + Trim(PasswordEdit.Text) +
195+
//Пересоздать ключи для хоста (пароль мог измениться) + отмена зависших sshpass
196+
S.Add('killall sshpass; sshpass -p "' + Trim(PasswordEdit.Text) +
197197
'" ssh -o StrictHostKeyChecking=No ' + Trim(UserEdit.Text) +
198198
// '@' + Trim(ServerEDit.Text) + ' -p ' + Trim(PortEdit.Text) + ' exit 0; fi');
199-
'@' + Trim(ServerEDit.Text) + ' -p ' + Trim(PortEdit.Text) + ' exit 0');
199+
'@' + Trim(ServerEDit.Text) + ' -p ' + Trim(PortEdit.Text));
200200

201201
S.Add('');
202202

@@ -207,7 +207,9 @@ procedure TMainForm.StartBtnClick(Sender: TObject);
207207
Trim(PortEdit.Text) + ' -x ' + Trim(ServerEDit.Text) + ':' +
208208
Trim(PortEdit.Text) + ' 0/0 ' + Trim(Pars));
209209

210-
S.Add('exit 0;');
210+
S.Add('exit 0');
211+
212+
showmessage('111');
211213

212214
S.SaveToFile('/etc/sshuttle-gui/connect.sh');
213215

‎sshuttle-gui/lib/x86_64-linux/unit1.o‎

-24 Bytes
Binary file not shown.

‎sshuttle-gui/lib/x86_64-linux/unit1.ppu‎

0 Bytes
Binary file not shown.

‎sshuttle-gui/sshuttle_gui‎

0 Bytes
Binary file not shown.

‎sshuttle-gui/sshuttle_gui.lps‎

Lines changed: 7 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@
3838
<Unit>
3939
<Filename Value="sshuttle_gui.lpr"/>
4040
<IsPartOfProject Value="True"/>
41-
<EditorIndex Value="1"/>
41+
<EditorIndex Value="-1"/>
4242
<UsageCount Value="38"/>
43-
<Loaded Value="True"/>
4443
</Unit>
4544
<Unit>
4645
<Filename Value="unit1.pas"/>
@@ -50,8 +49,8 @@
5049
<ResourceBaseClass Value="Form"/>
5150
<UnitName Value="Unit1"/>
5251
<IsVisibleTab Value="True"/>
53-
<CursorPos X="13"/>
54-
<ComponentState Value="1"/>
52+
<TopLine Value="193"/>
53+
<CursorPos Y="212"/>
5554
<UsageCount Value="38"/>
5655
<Loaded Value="True"/>
5756
<LoadedDesigner Value="True"/>
@@ -60,10 +59,9 @@
6059
<Filename Value="pingtrd.pas"/>
6160
<IsPartOfProject Value="True"/>
6261
<UnitName Value="PingTRD"/>
63-
<EditorIndex Value="2"/>
62+
<EditorIndex Value="-1"/>
6463
<CursorPos X="15"/>
6564
<UsageCount Value="34"/>
66-
<Loaded Value="True"/>
6765
</Unit>
6866
<Unit>
6967
<Filename Value="start_trd.pas"/>
@@ -73,126 +71,14 @@
7371
<UsageCount Value="35"/>
7472
</Unit>
7573
</Units>
76-
<JumpHistory HistoryIndex="29">
77-
<Position>
78-
<Filename Value="unit1.pas"/>
79-
<Caret Line="189" Column="20" TopLine="167"/>
80-
</Position>
81-
<Position>
82-
<Filename Value="unit1.pas"/>
83-
<Caret Line="133" Column="3" TopLine="131"/>
84-
</Position>
85-
<Position>
86-
<Filename Value="unit1.pas"/>
87-
<Caret Line="132" Column="3" TopLine="130"/>
88-
</Position>
89-
<Position>
90-
<Filename Value="unit1.pas"/>
91-
<Caret Line="49" Column="53" TopLine="35"/>
92-
</Position>
93-
<Position>
94-
<Filename Value="unit1.pas"/>
95-
<Caret Line="182" Column="53" TopLine="161"/>
96-
</Position>
97-
<Position>
98-
<Filename Value="unit1.pas"/>
99-
<Caret Line="194" Column="5" TopLine="179"/>
100-
</Position>
101-
<Position>
102-
<Filename Value="unit1.pas"/>
103-
<Caret Line="56" Column="6" TopLine="34"/>
104-
</Position>
105-
<Position>
106-
<Filename Value="unit1.pas"/>
107-
<Caret Line="55" Column="6" TopLine="33"/>
108-
</Position>
109-
<Position>
110-
<Filename Value="unit1.pas"/>
111-
<Caret Line="45" TopLine="45"/>
112-
</Position>
113-
<Position>
114-
<Filename Value="unit1.pas"/>
115-
<Caret Line="106" Column="2" TopLine="98"/>
116-
</Position>
117-
<Position>
118-
<Filename Value="unit1.pas"/>
119-
<Caret Line="148" TopLine="143"/>
120-
</Position>
121-
<Position>
122-
<Filename Value="unit1.pas"/>
123-
<Caret Line="105" Column="80" TopLine="98"/>
124-
</Position>
125-
<Position>
126-
<Filename Value="unit1.pas"/>
127-
<Caret Line="181" Column="58" TopLine="164"/>
128-
</Position>
129-
<Position>
130-
<Filename Value="unit1.pas"/>
131-
<Caret Line="182" Column="58" TopLine="165"/>
132-
</Position>
133-
<Position>
134-
<Filename Value="unit1.pas"/>
135-
<Caret Line="174" Column="19" TopLine="166"/>
136-
</Position>
137-
<Position>
138-
<Filename Value="unit1.pas"/>
139-
<Caret Line="153" Column="3" TopLine="148"/>
140-
</Position>
141-
<Position>
142-
<Filename Value="unit1.pas"/>
143-
<Caret Line="50" Column="17" TopLine="37"/>
144-
</Position>
145-
<Position>
146-
<Filename Value="unit1.pas"/>
147-
<Caret Line="203" TopLine="178"/>
148-
</Position>
149-
<Position>
150-
<Filename Value="unit1.pas"/>
151-
<Caret Line="166" Column="53" TopLine="154"/>
152-
</Position>
153-
<Position>
154-
<Filename Value="unit1.pas"/>
155-
<Caret Line="202" TopLine="173"/>
156-
</Position>
157-
<Position>
158-
<Filename Value="unit1.pas"/>
159-
<Caret Line="201" TopLine="172"/>
160-
</Position>
161-
<Position>
162-
<Filename Value="unit1.pas"/>
163-
<Caret Line="163" TopLine="153"/>
164-
</Position>
165-
<Position>
166-
<Filename Value="unit1.pas"/>
167-
<Caret Line="155" Column="11" TopLine="140"/>
168-
</Position>
169-
<Position>
170-
<Filename Value="unit1.pas"/>
171-
<Caret Line="167" Column="28" TopLine="158"/>
172-
</Position>
173-
<Position>
174-
<Filename Value="unit1.pas"/>
175-
<Caret Line="162" Column="24" TopLine="152"/>
176-
</Position>
177-
<Position>
178-
<Filename Value="unit1.pas"/>
179-
<Caret Line="147" Column="23" TopLine="21"/>
180-
</Position>
181-
<Position>
182-
<Filename Value="unit1.pas"/>
183-
<Caret Line="170" Column="17" TopLine="158"/>
184-
</Position>
185-
<Position>
186-
<Filename Value="unit1.pas"/>
187-
<Caret Line="149" Column="76" TopLine="144"/>
188-
</Position>
74+
<JumpHistory HistoryIndex="1">
18975
<Position>
19076
<Filename Value="unit1.pas"/>
191-
<Caret Line="154" Column="28" TopLine="144"/>
77+
<Caret Column="13"/>
19278
</Position>
19379
<Position>
19480
<Filename Value="unit1.pas"/>
195-
<Caret Line="190" Column="78" TopLine="174"/>
81+
<Caret Line="199" Column="65" TopLine="174"/>
19682
</Position>
19783
</JumpHistory>
19884
<RunParams>

‎sshuttle-gui/unit1.pas‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,14 +190,13 @@ procedure TMainForm.StartBtnClick(Sender: TObject);
190190
//Очистка прежних ключей (мог измениться пароль или хост)
191191
S.Add('sed -i "/^' + Trim(ServerEDit.Text) + '/d" /root/.ssh/known_hosts');
192192

193-
{ S.Add('if [[ ! -f /root/.ssh/known_hosts.old ]] || [[ -z $(ssh-keygen -F ' +
194-
Trim(ServerEDit.Text) + ') ]]; then'); }
193+
{ S.Add('if [[ -z $(ssh-keygen -F ' + Trim(ServerEDit.Text) + ') ]]; then'); }
195194

196-
//Пересоздать ключи для хоста (пароль мог измениться)
197-
S.Add('sshpass -p "' + Trim(PasswordEdit.Text) +
195+
//Пересоздать ключи для хоста (пароль мог измениться) + отмена зависших sshpass
196+
S.Add('killall sshpass; sshpass -p "' + Trim(PasswordEdit.Text) +
198197
'" ssh -o StrictHostKeyChecking=No ' + Trim(UserEdit.Text) +
199198
// '@' + Trim(ServerEDit.Text) + ' -p ' + Trim(PortEdit.Text) + ' exit 0; fi');
200-
'@' + Trim(ServerEDit.Text) + ' -p ' + Trim(PortEdit.Text) + ' exit 0');
199+
'@' + Trim(ServerEDit.Text) + ' -p ' + Trim(PortEdit.Text));
201200

202201
S.Add('');
203202

@@ -208,7 +207,7 @@ procedure TMainForm.StartBtnClick(Sender: TObject);
208207
Trim(PortEdit.Text) + ' -x ' + Trim(ServerEDit.Text) + ':' +
209208
Trim(PortEdit.Text) + ' 0/0 ' + Trim(Pars));
210209

211-
S.Add('exit 0;');
210+
S.Add('exit 0');
212211

213212
S.SaveToFile('/etc/sshuttle-gui/connect.sh');
214213

0 commit comments

Comments
 (0)