mirror of
				https://github.com/KevinMidboe/linguist.git
				synced 2025-10-29 17:50:22 +00:00 
			
		
		
		
	Merge pull request #2346 from larsbrinkhoff/public-key
Add support for SSH2 and OpenSSH public keys
This commit is contained in:
		| @@ -155,12 +155,12 @@ module Linguist | |||||||
|     end |     end | ||||||
|  |  | ||||||
|     disambiguate "AsciiDoc", "AGS Script", "Public Key" do |data| |     disambiguate "AsciiDoc", "AGS Script", "Public Key" do |data| | ||||||
|       if /^[=-]+(\s|\n)|{{[A-Za-z]/.match(data) |       if /^(----[- ]BEGIN|ssh-(rsa|dss)) /.match(data) | ||||||
|  |         Language["Public Key"] | ||||||
|  |       elsif /^[=-]+(\s|\n)|{{[A-Za-z]/.match(data) | ||||||
|         Language["AsciiDoc"] |         Language["AsciiDoc"] | ||||||
|       elsif /^(\/\/.+|((import|export)\s+)?(function|int|float|char)\s+((room|repeatedly|on|game)_)?([A-Za-z]+[A-Za-z_0-9]+)\s*[;\(])/.match(data) |       elsif /^(\/\/.+|((import|export)\s+)?(function|int|float|char)\s+((room|repeatedly|on|game)_)?([A-Za-z]+[A-Za-z_0-9]+)\s*[;\(])/.match(data) | ||||||
|         Language["AGS Script"] |         Language["AGS Script"] | ||||||
|       elsif /^-----BEGIN/.match(data) |  | ||||||
|         Language["Public Key"] |  | ||||||
|       end |       end | ||||||
|     end |     end | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,6 +1,9 @@ | |||||||
| AsciiDoc Home Page | AsciiDoc Home Page | ||||||
| ================== | ================== | ||||||
|  |  | ||||||
|  | Title | ||||||
|  | ----- | ||||||
|  |  | ||||||
| Example Articles | Example Articles | ||||||
| ~~~~~~~~~~~~~~~~ | ~~~~~~~~~~~~~~~~ | ||||||
| - Item 1 | - Item 1 | ||||||
|   | |||||||
							
								
								
									
										1
									
								
								samples/Public Key/id_dsa.asc
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								samples/Public Key/id_dsa.asc
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | |||||||
|  | ssh-dss AAAAB3NzaC1kc3MAAACBAIXi8hv+I7/bYzbve0Wg/Gv9yeZX0H/qON6rwJTPFICTncfK2t/Kc2Ec7+GYSkEIj7ok5wzHgv51SFTM6dvK/8hrjFE8frNztRK2TwZCvgYkbcBoprUstE86ZHBA1pAVPfHAOcF708Yk+KsxDONxkzu7FWw4HWqycqPtaavdcgsZAAAAFQC0uvetk3WY9sFNU71a32JKjkmTnwAAAIBlm1eGuATcZJvlk2jerZnTO54MlO/htWQrI4pZGLdhukOPgF1lsTUSwmCN8k8xxkyRL5Yl/8GUcdUfC4gbZvsbZGtvq5gFZSVTfkKJrlwykpZcaijWXtDiWSpqszs0MfexLMdpZSkNsWp7TEoWcqNLN8X7ohlsLAhcdrAbGqFblAAAAIBgW12r208h9AA3rH3t+6HKLXuPO1BQPuE+fKQg1Aet40c1gxUkCF/J+xdAITE1v7kmssZxBvDqUPgpvYCm+ZfA0j712pvt4JmQcfPn9Go003kq6/cgI4tCOy1dgQDLr0E5Jd7YqIglkr25fkDtKRFBRue3FmCGOdaM4NAAdYU48Q== lars@junk | ||||||
							
								
								
									
										1
									
								
								samples/Public Key/id_rsa.asc
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								samples/Public Key/id_rsa.asc
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | |||||||
|  | ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCw3QQtYgRViVH8ZpkQ2A7BuCeyPYC4hB9kKNhxwUfJ2hFgW8soGMBhsLN+vOeAJ2IXDMsezJO2/qhoZFQMvHoWpWTRTLPeNtBsKD+nhOZX28A4D+QRzVZ6hdWoh9W+mIP69MIT3aX35oLb86IycbNdRJlEK4FAUt7tjezNkU7boQ== root@use1-2.nitrousbox.com | ||||||
							
								
								
									
										7
									
								
								samples/Public Key/sshkey1.asc
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								samples/Public Key/sshkey1.asc
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,7 @@ | |||||||
|  | ---- BEGIN SSH2 PUBLIC KEY ---- | ||||||
|  | Subject: galb | ||||||
|  | Comment: 1024-bit rsa, created by galb@shimi Mon Jan 15 08:31:24 2001 | ||||||
|  | AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt459 | ||||||
|  | 6k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4soW6 | ||||||
|  | NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0= | ||||||
|  | ---- END SSH2 PUBLIC KEY ---- | ||||||
| @@ -77,7 +77,7 @@ class TestHeuristcs < Minitest::Test | |||||||
|     assert_heuristics({ |     assert_heuristics({ | ||||||
|       "AsciiDoc" => "AsciiDoc/list.asc", |       "AsciiDoc" => "AsciiDoc/list.asc", | ||||||
|       "AGS Script" => "AGS Script/GlobalScript.asc", |       "AGS Script" => "AGS Script/GlobalScript.asc", | ||||||
|       "Public Key" => "Public Key/sunCert.asc" |       "Public Key" => all_fixtures("Public Key", "*.asc") | ||||||
|     }) |     }) | ||||||
|   end |   end | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user