Node IDs are always upper case (ref #269)

This commit is contained in:
Jakob Borg committed 2014-05-24 21:01:21 +02:00
1 parent 217f29de76
commit e2cb0219c7
3 files changed
+4 -3

No files matched your search

+1 -1
View File
@@ -18,7 +18,7 @@ func init() {
bs, _ = ioutil.ReadAll(gr)
Assets["angular.min.js"] = bs
bs, _ = hex.DecodeString("1f8b080000096e8800ffd43c5b73db3697eff91588beb4a4129972ba3b9d1d2b4ea775d2ae37374f9ce4c5f503244212630a5440d0b6c6d57fdf830b49800029da4eda54336d2ce0e0e0dc702eb868fcf8739e2694a329cbae72c20e10670519a1594679420b527e5fa7452efe53dfd1e3f183f1e3459a4d718a1e1da0394e7300c27451a498e9ef02e84150c01f3967c98c0793070f2e3143f986cef832a10b74588e8856595ca4240caabe6084cece871339a060e914039a431430924b3c155c240865599a121606a765eb116729609817f03dc9280a1fe5b36c0d143e5a72be1ea29b07083e02f79a91cb17980be4fb93aa7541f8bb57d02478ad5bc5e4987145b9641128119d0abb20851239610e0037db49a3739e2cdcf6d5e6f885e02cb05a69161381e4ecdc83e4980a462df2743f612c639e713921f4a5e8736702c993d4258b9175567221dbc763740a6aa48b1c4dc93c63044db32ccd519a6517d0c23961f68c9c4b60a045b6df24f1010a5e2739271410817680c319d88ad41a3a6119cf66598a1404fa358e41dc39c901906fd660870127d71cbe692d2843dc8e0ce46ff0f529a1f1abe93a37d0bf2bf822133a7b2fd4fc3a59251c85af92dfc6f9b0c64d8bd594b04eecef011fa6c71418bdc4e9a93183ea4165170a6f8d595b8e1fb9eebc3bfe13cc302c90f43df9520090291c10190201c1481a4b19d520fdf10392a325ac64d290bc40fe7b9212a47a9502fa8bde98e10fe9697ea5f425c5d394c4c624aa0bbd48c0ee2e09dbd488857d76d2fd3a9bb520953df7c2799231de8e10e9eefe323e15edbf291f6dae1dd18cea76934c6bfcc7137ae2f2a95a90e8f40f3eb73ddca2484efd0b5baf5753311f8fefb3983fda8c0a6cbf167c49202ccdb074ea1f2d9677223cc1797e95b1b81ba901a511afeb964e6a3fbc36972d34a0fffdf0e1e41481af4430512f1b2ac55d052e0844a7c56c46484ce2b08c5be293cc51f8508629b3d5505542131e0e27765718fc87120edc5cc868100c85fbc769182c9398040d6837088acfd622a10e89b724a31ed84d842fe6daa46c5d91fd8ec1ebb8f26a2796115e30dac6a45fcc6db2bc99e2d945ccb235a81ae603cb02655f90cd34c32cd6a9d1b645d45d0c5681790e7c2c057095dd98b4c90c2702846199363d41c138dfc0425c018db9b0a63c0febc131e6b8c99c6d76139f62154620438c37481eaa2424f453a791970a32c7d57fbf9b7e86781781ccf2d04c478611aca59778b6349027b1a318af00649af38b4073184003a13368f8f8fef8285bad330a0e4060ea2b1e430c12ef59129f3b92687265feeda7d1c81f7b6b4ae4a534bb82d945160b79e355381c59103c86ce50c0ec55d9ee108dd1d3fdfd7d1b3289b5fb293f46720ce3bd66905088f975f2dce8cd0a5e755bfdc22982c45142519b80a587139dd112e7efae2864886bc2f8462aca032f3e65d532717ab74e0b8730ecc72226152aad987b83f9325ae1eb707f84fe073d569a9010c7f4b70d27f9878c4378dff314020e94103d8f872e85d6cc95e0daa786b4adcfdc1658ebe45b04f16fb644216913ad2394fdbe2c78005d6d58e6f4e4b0319d8bc1363073806a6aac439f71dae55ad38ded5aacaad4eabd4e9b059a7fbaede441b308830c8f17b9e5ee457333b689dc229bdb5e49c0815f3a849aafa031992714923f7fe88384855ec01aa781197dac195cd4a01b284760153f1453b4623ee5d97a0d337b31cb0d01ae7c4c203cb3671ad95f8f2ec1e5bf67fbe711cf3ec204ec085403c1e689ea00bd4c73cec2a7c389cd871e7e8806a2f084646080fefa0bd5adc7714a064d5e543798d90085839a4ab10d7142d80ce2075e10ad982768f0c370e0e5568bc460a819dcd7d9510a09e7b7d77742e7d93750762c2a3df6d5746d292c484035ad33eb7518b46571359a5ce9bd15d39a252b0c559f0f93477cb60a6d93f8e67a8428dec6b047ba6ac74ec603897fbf1f564b83eb1907ae0002a291d74cc4b252538c7d00060d93a65865b49ba719e48f308ddf298aad318f5314cd47732bb317d40a270f709ee0a807446fe1dfe317e7b6cd09c0a66ccaf648e48c2991d30a2182287c41b3b494638a844482464442446c91b60fd3ce098562a134a78500f4c3b089b1c3e10472e741f25e39628f588f6782a57f8350b38bdbca53d74db711da0a52c9bc5d5aaea3fe6ec5e5fac65e32731de14e99997ed11599d808fa9b25a6099342d3fb505d7efd970e7d1b22ffc758683881ce18d5ceca27b2530d82189b526968c6a9450b991ae292b01c70fbe8fb96e2491308bc9fdae7dea16788b5b198d8918ecdaee060250a267948639ed90086941373fb43d05b4e4b6b5122857562951a82458d374a095df025a45be8690bc75572d0c1a8c6066972ab31bcc52b975f8f35e85445f7f6cc4f0683b6f4a4d2334cdf32d804e9e0d1b69832f18782f9677f06c19749fed6c77853c55459426358d850982197be42090b556dc941c34e11ed924f1fe1f4960c89136e6cf0fb25331e439e7641104662f353e428307653755b4795910679b72eebecf2c4578c096d580d6496de3e5c62d7be130f009838c2e03fe56964df4d5ab9253ff4a6f7f892f496505e30f85fb622eab87b268fc162db0faa3640f5b062897c29709afb8533ea94ef104a59279aabcf0ef420b316d4b6349379a8491e7a37386c6abbf5d4a0ddbb835893d70b9722b61d517574ded8696fe5205247583a73b022960b75ca5994afd38487c148981a5e1b71e0da8803d71187d40a1c096a9e04a8cda675963b5bc3301dd8e8ff9dbe7b1be5f2203e993784301ca19b25c13144bf0374131c651468e27b1fc03f0560e7780da4a963aef1e73ca3c1d6da9eaefeea5e3903714a3368dbaf92072cadebc23accb18f955ace846e7b98d2223e8d3968732d9e1b150dd6f265c163e1b1efc29b9fa812a5770fd177dc640cb89b74b677e75f44066f62d448144ab40563607b7ac4a3885c8329c6e1cd7654466b9714310588efe535ac25af182db05392ced5c1462347b5525497df9ab0a83a9686758b0eab34a26a8e3e670985a58c3c7623805f0225198b1ec11a396192682b37102a2bc576a7c0636b207113534bf0305b127f31ce74f3657615f871e17807329f166f4c7901f9f186e215d0bfeda1c986bbf5aad20ff3f70b3a265060919dc2766674ceafe509965f24bb0fa07d72e8576c7833c5727d3cac1788b914546f0f4f21219b741811571eec89c4461dee59c7b7fe2311d9274f6e1aa81b1d3d98bd07c34da65d05742710ff48dc6ec628c84d3bcdb6ac69c0cb8d509c513242c9e4b68cf632fdaa48f4c8de81aa7c77b392030b48f18c84633406820398ae6ad92b5b7422e5e0ac9c95cfb3df3151ab2611b27345a30eb5e589274ad0337ba9aa721e3a9e3cf16dea99b067c9b9b9e5620ba5e32e4239b8e678e2806acaedc85a7ea68ce08b1e9b7dea681e30Line truncated
bs, _ = hex.DecodeString("1f8b080000096e8800ffd43cd973dbb69beff92b10fdd2924a64cae9ee7476ac389dd649bbde5c9e38c98beb07488424c614a880a06d8dabff7d3f1c240102a4683b6953cdb4b1707c37be0387c68f3fe76942399ab2ec2a27ec00715690119a659427b420e5f7755ae4e23ff51d3d1e3f183f5ea4d914a7e8d1019ae3348741982e8a1433fd5d0c7a1014f047ce5932e3c1e4c1834bcc50bea133be4ce8021d9633a2551617290983aa2f18a1b3f3e1444e28583ac500e610058ce4124e352e1284b22c4d090b83d3b2f588b31420cc0bf89e6414858ff259b6060a1f2d395f0fd1cd03041f017bcdc8e50bcc05f0fd49d5ba20fcdd2b6812bcd6ad0239665c512e59044a44a7822e48a14422cc61c0cd76d2e89c270bb77db5397e21380bac569ac54400393bf70039a682518b3cdd4f18cb98675e4e087d29fa5c4c207992ba6431b2ce4a2e64fb788c4e418d7491a32999678ca06996a5394ab3ec025a3827ccc6c8b91c0cb4c8f69b243e40c1eb24e7840220d00e7038035b915a43272ce3d92c4b911a817e8d6310774e7218c8376bb0c380936b0edfb41694216e4706f037f8fa94d0f8d5749d1be0df157c91099dbd176a7e9dac128ec257c96fe37c58c3a6c56a4a5827f4f7000fd3630a8c5ee2f4d4c0a07a50d985c25b43d696e307ae3bef0eff04330c0b247d4fbe1430c8140e880c818060268da58cea21fde10390a325ac64d290bc00fe7b9212a47a9502fa8bdec0f087f434bf52fa92e2694a620389ea422f12b0bb4bc2363560619f9d74bfce662d4065cfbd609e648cb70344babbbf8c4f45fb6fca479b6b4734a3badd24d39afff1849eb87caa16243afd93cf6d0fb7289253ffc2d6ebd554ccc7e3fb2ce68f36a302daaf055f12084b332c9dfa478be59d004f709e5f652cee066a8cd280d7754b27b51f5e9bcb161ad0ff7ef870728ac0572240d4cb864a7157810b02d169319b111293382ce396f82473143e9461ca6c355495d08487c389dd1506ffa184033717321a0443e1fe711a06cb24264163b41b04c5676b915087c45b92514fec26c217736d52b6aec87ec7e0755c79b513cb082f186d63d22fe63659de4cf1ec2266d91a540df8c0b240d9176433cd308b756ab46d1175178355609e031f4b31b8ca6e4cda64861301c0b04c9b9ea0609c6f6021ae80c65c58539e87f5e41873dc64ce36bb894fb10a229021e61b240f551212faa9d3c04b0599f3eabfdf4d3f43bc8b40667968a623c308d6d24b3c5b1ac093d8518c570032cdf94580390ca081d019347c7c7f7c94add61905072020f5158f210609f72c89cf1d4934b932fff6d368e48fbd3525f2529a5d017691c542de78150e47d6081e436728c6ec55d9ee108dd1d3fdfd7d7b64126bf7537e8ce418e67bcd20a110f3ebe4b9d19b15bceab6fa85530489a384a236014b0f273aa325cedf5d51c810d784f18d549467bcf89455cbc4e9dd3a2d1cc2b01f8a402a545a31f706f365b4c2d7e1fe08fd0f7aac3421471cd3df369ce41f320ee17dcf530838a384e8793c7429b43057826b470d695b1fdcd6b056e45b04f16fb644216913ad2394fdbe2c7806badab0cce9c961039d0bc1363073826a6aac439f71dae55ad38ded5aacaad4eabd4e9b059a1fdd76f2a059844186c78bdc72f7a2b919db446e91cd6daf24c6815f3a849aafa031992714923f7fe88384855ec01aa781197d2c0c2e68d00d9423b08a1f0a14ad904f79b65e03662f64b921c0958f098467f6a091fdf5ec72b8fcf76cff3ce2d94740c08e4035106c9ea80ed0cb34e72c7c3a9cd87ce8e98768200a4f480606e8afbf50dd7a1ca764d0e4457583990d5038a8a914db102784cd207ee005d18a7982063f0c075e6eb5480c869ac17d9d1da590707e7b7d27749e7d0365c7a2d2635f4dd796c2820454d38a59afc3a02d8babc1e44aefad90d62c5961a8fa7c903ce2b355689bc437d72344f136863dd2553b76321e48f8fbfda05a1a5ccf38700523201a79cd442c2b8562ec1b60d030698a5546bb799a41fe0868fc4e516c8d799ca2683e9a5b99bda056387918e7098e7a42f416fe3d7e716edb9c18d8944dd91e899c312512ad102288c217344b4b39a648482468442444c41669fb34ed9c5028164a132d04a01f864d881d0e27903b0f92f7ca117bc47a3c132cfd1b849a5ddc569eba6eba8dd056904ae6edd2721df5772b2ed737f69299eb0877caccf48baec8c446d0df2c314d98149ade87eaf2ebbf74e8db10f93fc642c30974c6a876563e919d6a10c4d8944a43334e2d5ac8d4232e09cb01b68fbe6f299e3481c0fba91df70e3d43ac8d0562473a36bb8283952898e4218d79660310524ecced0f416f8996d6a2440aeac42a35048b1a6e9412bae04b48b7d0d3168eabe4a083510d0dd2e45663788b572ebf1e6bd0a98aeeed999f0c066de949a56740df32d91cd2c1a36d3165e20f05f3cffe0c822f93fcad8ff1a68aa9b284c6b4b0a130432e7d851216aada9293869d22da259f3ec2e92d191227dcd8e0f74b663c863ced82208cc4e6a7c85160eea6eab68e2a233de4ddbaacb3cb135f3127b4c7ea4166e9ed832576ed3be1c000134618fca73c8decbb492bb7e487def41e5f92de12ca0b06ffcb56441d77cfe431586cfb41d506a01e562c912f054e73bf70469df21d4229eb4473f5d9011e64d602da9666320f35c943ef06874d6db79e1ab47b77106bf27ac152c4b603aa8ece1b3bedad1c44ea084b670e56c472479d7216e5eb34e1613012a686d7461cb836e2c075c421b50247829a27016ab3699de5ced630a0031bfdbfd3776fa35c1ec427f38610862374b3243886e877806e82a38c024d7cef03f8a700ec1caf813475cc35fe9c6734d85adbd30fba57cc409cce0cdaf6a9e4c14aeb7ab00e71ece3a496b3a0db1ea2b4884d430eda5c8ae7264583b57c59f05878eabbf0e627aa04e9dd3bf41d331913ee269dedddf91711c19b10351284126cc118d89c9ef12822d760827178b31d9551da2545a000f1bdbc8635e415a335ec94a47375a0d1c84dadd4d4e5b7262caa8ea361bda2c32a7da89aa3cf59426109238fdd88c12f81928c458f608d9c3049b4951308959562bb53c0b13590b809a92578c096c45f8cb3dc7c995d057e5838de01cca7c51b535e407ebca17805f46f7b68b2e166bdaaf48ff9fb051d1328acc84e613b189d736b7972e517c9ee83679f1cfa1519de0cb15c1f0feb05622e05d5dbc353c8914d3a8c482b0ff44442a30ef5ac635bff5188ec9327360dd08d8e1eccde83e126d3ae02ba13877f245e376314e4a49d665bd632e0e54628ce2819a164725b467b997e551c7a64ef8caa7c77b382030b48f18c8463340682034057b5ec952dd6a14f994e39182ad7e5f3f3774cd72a244292aea0d4d1b63cf744097a662f5c55d443c79327bead3d73ec59726e6ebcd822eab891504eae399e384335e5769c2d3f5346f0458f2d3f75400fLine truncated
gr, _ = gzip.NewReader(bytes.NewBuffer(bs))
bs, _ = ioutil.ReadAll(gr)
Assets["app.js"] = bs
+1
View File
@@ -191,6 +191,7 @@ func Load(rd io.Reader, myID string) (Configuration, error) {
// Strip spaces and dashes
node.NodeID = strings.Replace(node.NodeID, "-", "", -1)
node.NodeID = strings.Replace(node.NodeID, " ", "", -1)
node.NodeID = strings.ToUpper(node.NodeID)
}
// Check for missing, bad or duplicate repository ID:s
+2 -2
View File
@@ -273,7 +273,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
$scope.config.Options.ListenAddress = $scope.config.Options.ListenStr.split(',').map(function (x) { return x.trim(); });
$http.post(urlbase + '/config', JSON.stringify($scope.config), {headers: {'Content-Type': 'application/json'}});
}
$('#settings').modal("hide");
};
@@ -340,7 +340,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
$scope.configInSync = false;
$('#editNode').modal('hide');
nodeCfg = $scope.currentNode;
nodeCfg.NodeID = nodeCfg.NodeID.replace(/ /g, '').replace(/-/g, '').trim();
nodeCfg.NodeID = nodeCfg.NodeID.replace(/ /g, '').replace(/-/g, '').toUpperCase().trim();
nodeCfg.Addresses = nodeCfg.AddressesStr.split(',').map(function (x) { return x.trim(); });
done = false;