@@ -12,17 +12,15 @@ pub fn ssh_authenticate_git(
1212 attempt_count : usize ,
1313) -> Result < Cred , Error > {
1414 debug ! (
15- "Git authentication attempt #{} for URL: {}" ,
16- attempt_count, url
15+ "Git authentication attempt #{attempt_count} for URL: {url}"
1716 ) ;
18- debug ! ( "Username from URL: {:?}" , username_from_url ) ;
19- debug ! ( "Allowed credential types: {:?}" , allowed_types ) ;
17+ debug ! ( "Username from URL: {username_from_url :?}" ) ;
18+ debug ! ( "Allowed credential types: {allowed_types :?}" ) ;
2019
2120 // Prevent infinite loops
2221 if attempt_count > 3 {
2322 debug ! (
24- "Too many authentication attempts ({}), failing to prevent infinite loop" ,
25- attempt_count
23+ "Too many authentication attempts ({attempt_count}), failing to prevent infinite loop"
2624 ) ;
2725 return Err ( Error :: new (
2826 ErrorCode :: Auth ,
@@ -40,7 +38,7 @@ pub fn ssh_authenticate_git(
4038 debug ! ( "Second attempt: trying to add SSH keys to agent before authentication" ) ;
4139 if std:: env:: var ( "SSH_AUTH_SOCK" ) . is_ok ( ) {
4240 if let Err ( e) = add_all_ssh_keys ( ) {
43- debug ! ( "Failed to add keys to ssh-agent on second attempt: {}" , e ) ;
41+ debug ! ( "Failed to add keys to ssh-agent on second attempt: {e}" ) ;
4442 } else {
4543 debug ! ( "Keys added to ssh-agent, proceeding with authentication" ) ;
4644 }
@@ -56,18 +54,17 @@ pub fn ssh_authenticate_git(
5654 }
5755
5856 debug ! (
59- "All authentication methods failed for attempt {}" ,
60- attempt_count
57+ "All authentication methods failed for attempt {attempt_count}"
6158 ) ;
6259 Err ( Error :: new (
6360 ErrorCode :: Auth ,
6461 ErrorClass :: Net ,
65- format ! ( "Authentication failed - attempt {}" , attempt_count ) ,
62+ format ! ( "Authentication failed - attempt {attempt_count}" ) ,
6663 ) )
6764}
6865
6966fn try_ssh_agent_auth ( username : & str ) -> Result < Cred , Error > {
70- debug ! ( "Attempting SSH agent authentication for user: {}" , username ) ;
67+ debug ! ( "Attempting SSH agent authentication for user: {username}" ) ;
7168
7269 if std:: env:: var ( "SSH_AUTH_SOCK" ) . is_err ( ) {
7370 debug ! ( "SSH_AUTH_SOCK not set, attempting to spawn ssh-agent and add keys" ) ;
@@ -81,7 +78,7 @@ fn try_ssh_agent_auth(username: &str) -> Result<Cred, Error> {
8178 Ok ( cred)
8279 }
8380 Err ( e) => {
84- debug ! ( "SSH agent authentication failed: {}" , e ) ;
81+ debug ! ( "SSH agent authentication failed: {e}" ) ;
8582
8683 // Fallback to trying SSH key files directly
8784 debug ! ( "Falling back to direct SSH key file authentication" ) ;
@@ -97,7 +94,7 @@ fn spawn_ssh_agent_and_add_keys() -> Result<(), Error> {
9794 Error :: new (
9895 ErrorCode :: Auth ,
9996 ErrorClass :: Net ,
100- format ! ( "Failed to spawn ssh-agent: {}" , e ) ,
97+ format ! ( "Failed to spawn ssh-agent: {e}" ) ,
10198 )
10299 } ) ?;
103100
@@ -110,15 +107,15 @@ fn spawn_ssh_agent_and_add_keys() -> Result<(), Error> {
110107 }
111108
112109 let agent_output = String :: from_utf8_lossy ( & output. stdout ) ;
113- debug ! ( "ssh-agent output: {}" , agent_output ) ;
110+ debug ! ( "ssh-agent output: {agent_output}" ) ;
114111
115112 let env_vars = parse_ssh_agent_output ( & agent_output) ;
116113
117114 for ( key, value) in & env_vars {
118115 unsafe {
119116 std:: env:: set_var ( key, value) ;
120117 }
121- debug ! ( "Set environment variable: {}={}" , key , value ) ;
118+ debug ! ( "Set environment variable: {key }={value}" ) ;
122119 }
123120
124121 if !env_vars. contains_key ( "SSH_AUTH_SOCK" ) {
@@ -144,7 +141,7 @@ fn add_all_ssh_keys() -> Result<(), Error> {
144141 let ssh_dir = Path :: new ( & home_dir) . join ( ".ssh" ) ;
145142
146143 if !ssh_dir. exists ( ) {
147- debug ! ( "SSH directory {:?} does not exist" , ssh_dir ) ;
144+ debug ! ( "SSH directory {ssh_dir :?} does not exist" ) ;
148145 return Ok ( ( ) ) ;
149146 }
150147
@@ -155,7 +152,7 @@ fn add_all_ssh_keys() -> Result<(), Error> {
155152 let key_path = ssh_dir. join ( key_name) ;
156153
157154 if key_path. exists ( ) {
158- debug ! ( "Found SSH key: {:?}" , key_path ) ;
155+ debug ! ( "Found SSH key: {key_path :?}" ) ;
159156
160157 // First try a quick non-interactive add (for keys without passphrase)
161158 let quick_result = Command :: new ( "ssh-add" )
@@ -171,58 +168,56 @@ fn add_all_ssh_keys() -> Result<(), Error> {
171168
172169 match quick_result {
173170 Ok ( output) if output. status . success ( ) => {
174- debug ! ( "Successfully added key without interaction: {}" , key_name ) ;
171+ debug ! ( "Successfully added key without interaction: {key_name}" ) ;
175172 added_count += 1 ;
176173 }
177174 Ok ( output) => {
178175 let stderr = String :: from_utf8_lossy ( & output. stderr ) ;
179- debug ! ( "Quick add failed for {}: {}" , key_name , stderr ) ;
176+ debug ! ( "Quick add failed for {key_name }: {stderr}" ) ;
180177
181178 debug ! (
182- "Key {} appears to need passphrase, trying interactive add" ,
183- key_name
179+ "Key {key_name} appears to need passphrase, trying interactive add"
184180 ) ;
185181
186182 match add_key_interactive ( & key_path, key_name) {
187183 Ok ( true ) => {
188- debug ! ( "Successfully added key interactively: {}" , key_name ) ;
184+ debug ! ( "Successfully added key interactively: {key_name}" ) ;
189185 added_count += 1 ;
190186 }
191187 Ok ( false ) => {
192- debug ! ( "User skipped key: {}" , key_name ) ;
188+ debug ! ( "User skipped key: {key_name}" ) ;
193189 }
194190 Err ( e) => {
195- debug ! ( "Interactive add failed for {}: {}" , key_name , e ) ;
191+ debug ! ( "Interactive add failed for {key_name }: {e}" ) ;
196192 }
197193 }
198194 }
199195 Err ( e) => {
200- debug ! ( "Error running ssh-add for {}: {}" , key_name , e ) ;
196+ debug ! ( "Error running ssh-add for {key_name }: {e}" ) ;
201197 }
202198 }
203199 } else {
204- debug ! ( "SSH key not found: {:?}" , key_path ) ;
200+ debug ! ( "SSH key not found: {key_path :?}" ) ;
205201 }
206202 }
207203
208- debug ! ( "Added {} SSH keys to ssh-agent" , added_count ) ;
204+ debug ! ( "Added {added_count } SSH keys to ssh-agent" ) ;
209205
210206 if added_count == 0 {
211207 debug ! ( "No SSH keys were added" ) ;
212208 println ! ( "No SSH keys were added to ssh-agent." ) ;
213209 println ! ( "You may need to generate SSH keys or check your ~/.ssh directory." ) ;
214210 } else {
215211 println ! (
216- "Successfully added {} SSH key(s) to ssh-agent." ,
217- added_count
212+ "Successfully added {added_count} SSH key(s) to ssh-agent."
218213 ) ;
219214 }
220215
221216 Ok ( ( ) )
222217}
223218
224219fn try_ssh_key_files_directly ( username : & str ) -> Result < Cred , Error > {
225- debug ! ( "Trying SSH key files directly for user: {}" , username ) ;
220+ debug ! ( "Trying SSH key files directly for user: {username}" ) ;
226221
227222 let home_dir = std:: env:: var ( "HOME" )
228223 . or_else ( |_| std:: env:: var ( "USERPROFILE" ) )
@@ -233,10 +228,10 @@ fn try_ssh_key_files_directly(username: &str) -> Result<Cred, Error> {
233228
234229 for key_name in & key_files {
235230 let private_key_path = ssh_dir. join ( key_name) ;
236- let public_key_path = ssh_dir. join ( format ! ( "{}.pub" , key_name ) ) ;
231+ let public_key_path = ssh_dir. join ( format ! ( "{key_name }.pub" ) ) ;
237232
238233 if private_key_path. exists ( ) && public_key_path. exists ( ) {
239- debug ! ( "Trying SSH key pair: {} / {}.pub" , key_name , key_name ) ;
234+ debug ! ( "Trying SSH key pair: {key_name } / {key_name }.pub" ) ;
240235
241236 match Cred :: ssh_key (
242237 username,
@@ -245,11 +240,11 @@ fn try_ssh_key_files_directly(username: &str) -> Result<Cred, Error> {
245240 None , // No passphrase for now
246241 ) {
247242 Ok ( cred) => {
248- debug ! ( "SSH key authentication succeeded with {}" , key_name ) ;
243+ debug ! ( "SSH key authentication succeeded with {key_name}" ) ;
249244 return Ok ( cred) ;
250245 }
251246 Err ( e) => {
252- debug ! ( "SSH key authentication failed with {}: {}" , key_name , e ) ;
247+ debug ! ( "SSH key authentication failed with {key_name }: {e}" ) ;
253248 }
254249 }
255250 }
0 commit comments